--- a/tip_pbc/mw/qtextensions/package_definition.xml	Mon Sep 06 18:32:37 2010 +0100
+++ b/tip_pbc/mw/qtextensions/package_definition.xml	Tue Sep 07 16:33:09 2010 +0100
@@ -50,47 +50,40 @@
   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="qtextensions" level="generic" levels="tool mw app" long-name="Qt Extensions">
+   <block name="qtextensions" level="generic" long-name="Qt Extensions" levels="tool mw app">
 <collection name="qtecomplugins" long-name="Qt ECom Plugins" level="app">
-<component name="qtecomplugins_build" long-name="Qt ECom Plugin" introduced="^4" filter="qtecomplugins" purpose="development" plugin="Y">
-<unit bldFile="/sf/mw/qtextensions/qtecomplugins" proFile="qtecomplugins.pro" qmakeArgs="-r"/>
+<component name="qtecomplugins_build" filter="s60,qtecomplugins" long-name="Qt ECom Plugin" purpose="development" introduced="^4" plugin="Y">
+<unit bldFile="/sf/mw/qtextensions/qtecomplugins" proFile="qtecomplugins.pro"/>
 </component>
-<component name="qtextensions_examples" long-name="Qt ECom Plugin Examples" introduced="^4" filter="qtextensionsexamples,build_as_app" purpose="development">
-<unit bldFile="/sf/mw/qtextensions/qtecomplugins/examples" proFile="examples.pro" qmakeArgs="-r"/>
+<component name="qtextensions_examples" filter="s60,qtextensionsexamples,build_as_app" long-name="Qt ECom Plugin Examples" purpose="development" introduced="^4">
+<unit bldFile="/sf/mw/qtextensions/qtecomplugins/examples" proFile="examples.pro"/>
 </component>
 </collection>
 <collection name="qthighway" long-name="Qt Highway" level="app">
-<component name="qthighway_build" long-name="Qt Highway" introduced="^4" filter="qthighway" purpose="development">
-<unit bldFile="/sf/mw/qtextensions/qthighway" proFile="qthighway.pro" qmakeArgs="-r"/>
-</component>
-<component name="qthighway_examples" long-name="Qt Highway Examples" introduced="^4" filter="qtextensionsexamples,build_as_app" purpose="development">
-<unit bldFile="/sf/mw/qtextensions/qthighway/examples" proFile="examples.pro" qmakeArgs="-r"/>
+<component name="qthighway_build" filter="s60,qthighway" long-name="Qt Highway" purpose="development" introduced="^4">
+<unit bldFile="/sf/mw/qtextensions/qthighway" proFile="qthighway.pro"/>
 </component>
 </collection>
 <collection name="qtmobileextensions" long-name="Qt Mobile Extensions" level="app">
-<component name="qtmobileextensions_build" long-name="Qt Mobile Extensions" introduced="^4" filter="qtextension" purpose="development">
-<unit bldFile="/sf/mw/qtextensions/qtmobileextensions" proFile="qtmobileextensions.pro" qmakeArgs="-r"/>
+<component name="qtmobileextensions_build" filter="s60,qtextension" long-name="Qt Mobile Extensions" purpose="development" introduced="^4">
+<unit bldFile="/sf/mw/qtextensions/qtmobileextensions" proFile="qtmobileextensions.pro"/>
 </component>
-<component name="qtmobileextensions_examples" long-name="Qt Mobile Extensions Examples" introduced="^4" filter="qtextensionsexamples,build_as_app" purpose="development">
-<unit bldFile="/sf/mw/qtextensions/qtmobileextensions/examples" proFile="examples.pro" qmakeArgs="-r"/>
+<component name="qtmobileextensions_examples" filter="s60,qtextensionsexamples,build_as_app" long-name="Qt Mobile Extensions Examples" purpose="development" introduced="^4">
+<unit bldFile="/sf/mw/qtextensions/qtmobileextensions/examples" proFile="examples.pro"/>
 </component>
 </collection>
-<collection name="qhbstyle" long-name="Qt Orbit Style" level="mw">
-<component name="qhbstyle_build" long-name="Qt Orbit Style Build" introduced="^4" purpose="optional">
-<unit bldFile="/sf/mw/qtextensions/qhbstyle" proFile="qhbstyle.pro" qmakeArgs="-r"/>
+<collection name="qhbstyle" level="mw" long-name="Qt Orbit Style">
+<component name="qhbstyle_build" long-name="Qt Orbit Style Build" introduced="^4" filter="s60">
+<unit bldFile="/sf/mw/qtextensions/qhbstyle" proFile="qhbstyle.pro"/>
 </component>
 </collection>
 <collection name="qtextensions_info" long-name="Qt Extensions Info" level="app">
-<component name="qtextensions_conf" long-name="Qt Extensions Confgure" introduced="^4" filter="qt_tools" purpose="optional" class="config">
+<component name="qtextensions_conf" long-name="Qt Extensions Confgure" introduced="^4" filter="s60,qt_tools" class="config">
 <unit bldFile="/sf/mw/qtextensions/group"/>
 </component>
-<component name="qtextensions_build" long-name="Qt Extensions Build" introduced="^4" purpose="optional">
-<!-- break this up into the above collections-->
-<unit bldFile="/sf/mw/qtextensions/." proFile="qtextensions.pro" qmakeArgs="-r"/>
-</component>
 </collection>
 </block>
   </layer>