diff -r b4d1168d3460 -r 4469f26a2533 symbian3/mw/qt/package_definition.xml
--- a/symbian3/mw/qt/package_definition.xml	Mon Apr 12 10:32:00 2010 +0100
+++ b/symbian3/mw/qt/package_definition.xml	Wed Apr 21 18:29:51 2010 +0100
@@ -1,46 +1,68 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE SystemDefinition [
- <!ELEMENT SystemDefinition (systemModel)>
- <!ATTLIST SystemDefinition
+<!ELEMENT SystemDefinition ( systemModel )>
+<!ATTLIST SystemDefinition
   name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (block*|collection*)*>
- <!ATTLIST layer
+  schema CDATA #REQUIRED
+>
+<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
+
+<!-- System Model Section of DTD -->
+<!ELEMENT systemModel (layer+)>
+
+<!ELEMENT layer (block* | collection*)*>
+<!-- Kernel Services, Base Services, OS Services, Etc -->
+<!ATTLIST layer
   name CDATA #REQUIRED
   long-name CDATA #IMPLIED
   levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT block (subblock*|collection*)*>
- <!ATTLIST block
+  span CDATA #IMPLIED
+>
+
+<!ELEMENT block (subblock* | collection*)*>
+ <!-- Generic OS services, Comms Services, etc -->
+<!ATTLIST block
   levels NMTOKENS #IMPLIED
   span CDATA #IMPLIED
   level NMTOKEN #IMPLIED
   name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT subblock (collection)*>
- <!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED>
- <!ELEMENT collection (component)*>
- <!ATTLIST collection
+  long-name CDATA #IMPLIED
+>
+
+<!ELEMENT subblock (collection)*>
+<!-- Cellular Baseband Services, Networking Services, etc -->
+<!ATTLIST subblock
   name CDATA #REQUIRED
   long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED>
- <!ELEMENT component (unit)*>
- <!ATTLIST component
+>
+
+<!ELEMENT collection (component)*>
+<!-- Screen Driver, Content Handling, etc -->
+<!ATTLIST collection
+  name CDATA #REQUIRED
+  long-name CDATA #IMPLIED
+  level NMTOKEN #IMPLIED
+>
+
+<!ELEMENT component (unit)*>
+<!-- contains units or is a  package or prebuilt -->
+<!ATTLIST component
   name CDATA #REQUIRED
   long-name CDATA #IMPLIED
   deprecated CDATA #IMPLIED
   introduced CDATA #IMPLIED
   contract CDATA #IMPLIED
-  plugin (Y|N) 'N'
+  plugin (Y|N) "N"
   filter CDATA #IMPLIED
   class NMTOKENS #IMPLIED
   supports CDATA #IMPLIED
-  purpose (optional|mandatory|development) 'optional'>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
+  purpose ( optional | mandatory | development ) "optional"
+>
+
+<!ELEMENT unit EMPTY >
+<!-- must be buildable (bld.inf) -->
+<!-- bldFile  may someday be removed in favour of mrp -->
+<!ATTLIST unit
   mrp CDATA #IMPLIED
   filter CDATA #IMPLIED
   bldFile CDATA #IMPLIED
@@ -48,12 +70,46 @@
   version NMTOKEN #IMPLIED
   prebuilt NMTOKEN #IMPLIED
   late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED>
+  priority CDATA #IMPLIED
+>
 ]>
 <SystemDefinition name="Symbian^3" schema="2.0.1">
 <systemModel>
 <layer name="mw" long-name="Middleware" levels="generic specific">
-<block name="qt" level="generic" 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" 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">
+<unit bldFile="/sf/mw/qt" proFile="projects.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="qtdemos" long-name="Qt Demos" level="app">
+<component name="qtdemos_build" long-name="Qt Demos Build" introduced="^2" filter="qtdemos">
+<unit bldFile="/sf/mw/qt/demos" proFile="demos.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+<collection name="qtexamples" long-name="Qt Examples" level="app">
+<component name="qtexamples_build" long-name="Qt Examples Build" introduced="^2" filter="qtexamples">
+<unit bldFile="/sf/mw/qt/examples" proFile="examples.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+
+<!-- dont build test yet. this should be filtered out in future.
+<collection name="qt_tests" long-name="Qt Tests" level="app">
+<component name="qttestsauto" long-name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
+<unit bldFile="/sf/mw/qt/tests/auto" proFile="qtpauto.pro"/>
+</component>
+<component name="qttestsbenchmarks" long-name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
+<unit bldFile="/sf/mw/qt/tests/benchmarks" proFile="benchmarks.pro" qmakeArgs="-r"/>
+</component>
+</collection>
+-->
+
+</block>
 </layer>
 </systemModel>
-</SystemDefinition>
\ No newline at end of file
+</SystemDefinition>