--- a/tip_pbc/mw/qtmobility/package_definition.xml	Mon Sep 06 18:32:37 2010 +0100
+++ b/tip_pbc/mw/qtmobility/package_definition.xml	Tue Sep 07 16:33:09 2010 +0100
@@ -50,16 +50,20 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="mw" long-name="Middleware" levels="generic specific">
-   <block name="qtmobility" level="generic" levels="tool mw app" long-name="Qt Mobility">
-<collection name="qtmobility_collection" long-name="Qt Mobility collection" level="app">
-<component name="qtmobility_build" long-name="Qt Mobility Build" introduced="^4" purpose="optional">
-<!-- break this up into the above collections-->
-<unit bldFile="/sf/mw/qtmobility/." proFile="qtmobility.pro" qmakeArgs="-r"/>
+   <block name="qtmobility" level="generic" long-name="Qt Mobility" levels="tool mw app">
+<collection name="qtmobility_info" long-name="Qt Mobility Info" level="mw">
+<component name="qtmobilityconf" long-name="Qt Mobility Config" filter="s60,tools" introduced="^4">
+<unit bldFile="/sf/mw/qtmobility/group"/>
+</component>
+<component name="qtmobility_build" long-name="Qt Mobility Build" introduced="^4" filter="s60">
+<unit bldFile="/sf/mw/qtmobility" proFile="qtmobility.pro"/>
 </component>
 </collection>
+<collection name="qtmobility_examples" long-name="Qt Mobility Examples" level="app"/>
+<collection name="tests" long-name="Qt Mobility Tests"/>
 </block>
   </layer>
  </systemModel>