--- a/symbian4/mw/qt/package_definition.xml	Mon Sep 06 18:32:37 2010 +0100
+++ b/symbian4/mw/qt/package_definition.xml	Tue Sep 07 16:33:09 2010 +0100
@@ -50,18 +50,18 @@
   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="qt" level="generic" levels="tool mw app" long-name="Qt">
+   <block name="qt" level="generic" long-name="Qt" levels="tool mw app">
 <collection name="qtconf" long-name="Qt Config" level="tool">
-<component name="qt_deviceconfiguration" long-name="Qt Device Configuration" introduced="^2" filter="qt_tools" purpose="optional" class="config tool">
+<component name="qt_deviceconfiguration" long-name="Qt Device Configuration" filter="s60,qt_tools" introduced="^2" class="config tool">
 <unit bldFile="/sf/mw/qt/src/s60installs/deviceconfiguration"/>
 </component>
 </collection>
 <collection name="qt_info" long-name="Qt Info" level="mw">
-<component name="qt_build" long-name="Qt Build" introduced="^2" purpose="optional">
-<unit bldFile="/sf/mw/qt/." proFile="projects.pro" qmakeArgs="-r"/>
+<component name="qt_build" long-name="Qt Build" introduced="^2" filter="s60">
+<unit bldFile="/sf/mw/qt" proFile="projects.pro"/>
 </component>
 </collection>
 <collection name="qtdemos" long-name="Qt Demos" level="app"/>