# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1277482684 -3600
# Node ID 079a06b9ec5894f048e1b67f930b82e77d7afab4
# Parent  e2c657c13ee2c0b6de767b8904572f1629a7725f
Update S^4 package definitions with Bob Rosenberg's set for wk20
Marked simtsy as a "test" component, as it doesn't build anyway.

diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/app/commonemail/package_definition.xml
--- a/symbian4/app/commonemail/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/app/commonemail/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -26,6 +26,9 @@
       <component id="nmailagent" filter="s60" name="Nmail Agent" introduced="^4">
        <!-- <unit bldFile="emailservices/nmailagent" qt:proFile="nmailagent.pro"/>-->
       </component>
+     <component id="nmutilities" filter="s60" name="Nmail Utilities" introduced="^4">
+        <!-- <unit bldFile="emailservices/nmutilities" qt:proFile="nmutilities.pro"/> -->
+      </component>
     </collection>
     <collection id="ipsservices" name="IMAP/POP/SMTP Services" level="service">
       <component id="ipssosplugin" filter="s60" name="IPS SOS Plugin" class="plugin" introduced="^2">
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/app/contacts/package_definition.xml
--- a/symbian4/app/contacts/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/app/contacts/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -8,8 +8,8 @@
    </component>
   </collection>
   <collection id="phonebookui" name="Phonebook UI" level="ui">
-   <component id="mobhistorymodel" filter="s60" name="Mobile History Model" introduced="^4">
-    <!--<unit bldFile="phonebookui/mobhistorymodel" qt:proFile="mobhistorymodel.pro"/> -->
+   <component id="cnthistorymodel" filter="s60" name="Contacts History Model" introduced="^4">
+    <!--<unit bldFile="phonebookui/cnthistorymodel" qt:proFile="cnthistorymodel.pro"/> -->
    </component>
    <component id="pbkcommonui" filter="s60" name="Phonebook Common UI" introduced="^4">
     <!--<unit bldFile="phonebookui/pbkcommonui" qt:proFile="pbkcommonui.pro"/> -->
@@ -25,33 +25,31 @@
     <unit bldFile="phonebookui" qt:proFile="phonebookui.pro"/>
    </component>
   </collection>
-  <collection id="qtcontactsmobility" name="Qt Contacts Mobility" level="support">
-   <component id="qtcontactsmobility_build" filter="s60" name="Qt Contacts Mobility Build" class="plugin" introduced="^4">
-	<!-- not really a component, move down a dir? Break up into compnents? -->
-    <unit bldFile="qtcontactsmobility" qt:proFile="qtcontactsmobility.pro"/>
-   </component>
-  </collection>
   <collection id="phonebookengines" name="Phonebook Engines" level="engine">
    <component id="cntfindplugin" filter="s60" name="Contacts Find Plugin" class="plugin" introduced="^2">
     <unit bldFile="phonebookengines/cntfindplugin" qt:proFile="cntfindplugin.pro"/>
    </component>
    <component id="contactsmodel" name="Contacts Model" introduced="ER5" purpose="optional">
-    <unit bldFile="phonebookengines/contactsmodel" qt:proFile="contactsmodel.pro"/>
+    <unit version="2" bldFile="phonebookengines/contactsmodel/groupsql" mrp="phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp"/>
    </component>
    <component id="cntsortplugin" filter="s60" name="Contacts Sort Plugin" class="plugin" introduced="^2">
     <unit bldFile="phonebookengines/cntsortplugin" qt:proFile="cntsortplugin.pro"/>
    </component>
-   <component id="cntlistmodel" filter="s60" name="Contacts List Model" introduced="^4">
-    <unit bldFile="phonebookengines/cntlistmodel" qt:proFile="cntlistmodel.pro"/>
+   <component id="qtcontactsmobility" filter="s60" name="Qt Contacts Mobility" class="plugin" introduced="^4">
+	<!-- need to move to this actual dir rather than including something from another collection -->
+    <unit bldFile="qtcontactsmobility" qt:proFile="qtcontactsmobility.pro"/>
    </component>
-   <component id="cntactions" filter="s60" name="cntactions" introduced="^4">
-    <unit bldFile="phonebookengines/cntactions" qt:proFile="cntactions.pro"/>
+   <component id="mobcntmodel" filter="s60" name="Mobile Contacts Model" introduced="^4">
+    <unit bldFile="phonebookengines/mobcntmodel" qt:proFile="mobcntmodel.pro"/>
+   </component>
+   <component id="mobcntactions" filter="s60" name="Mobile Contacts Actions" introduced="^4">
+    <unit bldFile="phonebookengines/mobcntactions" qt:proFile="mobcntactions.pro"/>
    </component>
    <component id="cntmaptileservice" filter="s60" name="Contacts Map Tile Service" introduced="^4">
     <unit bldFile="phonebookengines/cntmaptileservice" qt:proFile="cntmaptileservice.pro"/>
    </component>
-   <component id="cndsimutility" filter="s60" name="Contacts SIM Utility" introduced="^4">
-    <unit bldFile="phonebookengines/cntsimutility" qt:proFile="cntsimutility.pro"/>
+   <component id="simutility" filter="s60" name="SIM Utility" introduced="^4">
+    <unit bldFile="phonebookengines/simutility" qt:proFile="simutility.pro"/>
    </component>
    <component id="cntimageutility" name="Contacts Image Utility" filter="s60" introduced="^4">
       <unit bldFile="phonebookengines/cntimageutility" qt:proFile="cntimageutility.pro"/>
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/app/files/package_definition.xml
--- a/symbian4/app/files/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/app/files/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -5,13 +5,20 @@
    <component id="filemanager_plat" name="File Manager Platform Interfaces" class="api" filter="s60" introduced="^4">
     <unit base="filemanager/filemanager_plat"/>
    </component>
-   <component id="fmbkupengine" filter="s60" name="File Manager Backup Engine" introduced="^4">
+   <component id="fmbkupengine" filter="s60,bldfirst" name="File Manager Backup Engine" introduced="^4">
        <unit bldFile="filemanager/src/fmbkupengine/group"/>
    </component>
+   <component id="fmfiledialog" filter="s60,bldfirst" name="File Manager File Dialog" introduced="^4">
+       <unit bldFile="filemanager/src/fmfiledialog" qt:proFile="fmfiledialog.pro" qt:qmakeArgs="-r -config rom"/>
+   </component>
    <component id="filemanager_build" filter="s60" name="File Manager Build">
    <!-- break this up into components or move down a directory -->
     <unit bldFile="filemanager" qt:qmakeArgs="-r" qt:proFile="filemanager.pro"/>
    </component>
+   <component id="filemanager_tests" name="File Manager Tests" filter="s60,test,qt_unit_test">
+     <unit bldFile="filemanager/tsrc" qt:proFile="tsrc.pro" qt:qmakeArgs="-r"/>
+   </component>
   </collection>
  </package>
 </SystemDefinition>
+        
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/app/homescreen/package_definition.xml
--- a/symbian4/app/homescreen/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/app/homescreen/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -1,43 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
  <package id="homescreen" name="Home Screen Apps" levels="support task ss hs">
-
-   <collection id="homescreen_info" name="Home Screen Info" level="support">
-    <component id="homescreen_build" name="Homescreen Build">
-		<!-- break this up properly into components -->
-      <unit bldFile="."  qt:proFile="homescreen.pro" qt:qmakeArgs="-r -config rom"/>
-     </component>
-    </collection>
     <collection id="homescreen_test" name="Home Screen Test" level="support">
-    <component id="tsrc_build" name="Tsrc Build" filter="test,unit_test">
+    <component id="homescreen_tsrc_build" name="Home Screen Test Build" filter="test,unit_test">
       <unit bldFile="tsrc" qt:proFile="tsrc.pro" qt:qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
      </component>
     </collection>
-	<!-- fiill in details with broken up homescreen_build -->
   <collection id="homescreenapp" name="Home Screen Application" level="hs">
-	<component id="hsutils" name="Home Screen Utils" introduced="^4"/>
-	<component id="hsdomainmodel" name="HS Domain Model" introduced="^4"/>
-	<component id="hs_runtimeplugins" name="HS Runtime Plugins" introduced="^4" class="plugin"/>
-	<component id="hs_serviceproviders" name="HS Service Providers" introduced="^4" class="plugin"/>
-	<component id="hs_stateplugins" name="HS State Plugins" introduced="^4" class="plugin"/>
-	<component id="hs_widgetplugins" name="HS Widget Plugins" introduced="^4" class="plugin"/>
-	<component id="hsapplication" name="Home Screen Application" introduced="^4"/>
-	<component id="hshomescreenclientplugin" name="Home Screen Client Plugin" introduced="^4" class="plugin"/>
-	<component id="hsmenucontentpublish" name="HS Menu Content Publish" introduced="^4"/>
-    </collection>
-  <collection id="screensaverapp" name="Screen Saver Application" level="ss">
-	<component id="snsrutils" name="Screen Saver Utils" introduced="^4"/>
-	<component id="snsr_serviceproviders" name="Screen Saver Service Providers" introduced="^4" class="plugin"/>
-	<component id="snsr_stateproviders" name="Screen Saver State Providers" introduced="^4" class="plugin"/>
-	<component id="snsr_runtimeproviders" name="Screen Saver Runtime Providers" introduced="^4" class="plugin"/>
-	<component id="snsrapplication" name="Screen Saver Application" introduced="^4"/>
-	<component id="screensaverproviders" name="Screen Saver Providers" introduced="^4" class="plugin"/>
+	<component id="hsutils" name="Home Screen Utils" introduced="^4">
+      <unit bldFile="homescreenapp/hsutils"  qt:proFile="hsutils.pro" qt:qmakeArgs="-r -config rom"/>
+     </component>
+	<component id="hsdomainmodel" name="HS Domain Model" introduced="^4">
+      <unit bldFile="homescreenapp/hsdomainmodel"  qt:proFile="hsdomainmodel.pro" qt:qmakeArgs="-r -config rom"/>
+     </component>
+	<component id="hs_runtimeplugins" name="HS Runtime Plugins" introduced="^4" class="plugin">
+      <unit bldFile="homescreenapp/runtimeplugins"  qt:proFile="runtimeplugins.pro" qt:qmakeArgs="-r -config rom"/>
+     </component>
+	<component id="hs_serviceproviders" name="HS Service Providers" introduced="^4" class="plugin">
+      <unit bldFile="homescreenapp/serviceproviders"  qt:proFile="serviceproviders.pro" qt:qmakeArgs="-r -config rom"/>
+     </component>
+	<component id="hs_stateplugins" name="HS State Plugins" introduced="^4" class="plugin">
+      <unit bldFile="homescreenapp/stateplugins"  qt:proFile="stateplugins.pro" qt:qmakeArgs="-r -config rom"/>
+     </component>
+	<component id="hs_widgetplugins" name="HS Widget Plugins" introduced="^4" class="plugin">
+      <unit bldFile="homescreenapp/widgetplugins"  qt:proFile="widgetplugins.pro" qt:qmakeArgs="-r -config rom"/>
+     </component>
+	<component id="hsapplication" name="Home Screen Application" introduced="^4">
+      <unit bldFile="homescreenapp/hsapplication"  qt:proFile="hsapplication.pro" qt:qmakeArgs="-r -config rom"/>
+     </component>
+	<component id="hsmenuclientplugin" name="Home Screen Menu Client Plugin" introduced="^4" class="plugin">
+      <unit bldFile="homescreenapp/hsmenuclientplugin"  qt:proFile="hsmenuclientplugin.pro" qt:qmakeArgs="-r -config rom"/>
+     </component>
+	<component id="hshomescreenclientplugin" name="HS Menu Client Plugin" introduced="^4" class="plugin">
+      <unit bldFile="homescreenapp/hshomescreenclientplugin"  qt:proFile="hshomescreenclientplugin.pro" qt:qmakeArgs="-r -config rom"/>
+     </component>
+	<component id="hswidgetuninstaller" name="HS Widget Uninstaller" introduced="^4">
+      <unit bldFile="homescreenapp/hswidgetuninstaller"  qt:proFile="hswidgetuninstaller.pro" qt:qmakeArgs="-r -config rom"/>
+     </component>
+	<component id="homescreenapp_rom" name="Home Screen App ROM" introduced="^4">
+      <unit bldFile="homescreenapp"  qt:proFile="homescreenapp_exports_to_rom.pri" qt:qmakeArgs="-r -config rom"/>
+     </component>
     </collection>
   <collection id="taskswitcherapp" name="Task Switcher Application" level="task">
-	<component id="taskswitcherappecom" name="Task Switcher Application ECom" introduced="^4"/>
-	<component id="tsserviceplugin" name="Task Switcher Service Plugin" introduced="^4" class="plugin"/>
-	<component id="ts_runtimeplugins" name="TS Runtime Plugins" introduced="^4" class="plugin"/>
-	<component id="tsapplication" name="Task Switcher Application" introduced="^4"/>
+	<!-- break collection info components, or move down a dir and make it a component -->
+    <component id="taskswitcherapp_build" name="Task Switcher Application Build">
+      <unit bldFile="taskswitcherapp"  qt:proFile="taskswitcherapp.pro" qt:qmakeArgs="-r -config rom"/>
+     </component>
+	<component id="tsdevicedialogplugin" name="Task Switcher Device Dialog Plugin" introduced="^4" class="plugin"/>
     </collection>
  </package>
 </SystemDefinition>
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/app/internetradio/package_definition.xml
--- a/symbian4/app/internetradio/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/app/internetradio/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -18,9 +18,9 @@
 	<!--  Move down a dir or break into components-->
       <unit bldFile="qtinternetradio"  qt:proFile="all.pro" qt:qmakeArgs="-r -config rom"/>
      </component>
-     <component id="qtinternetradio_internal" name="Qt Internet Radio Internal" filter="test">
+     <component id="qtinternetradio_internal" name="Qt Internet Radio Internal" filter="test,qt_unit_test">
 	  <!-- appears to be missing. Remove? 
-	  <unit bldFile="qtinternetradio/internal/tsrc" qt:proFile="tsrc.pro" qt:qmakeArgs="-r -config rom"/> -->
+	  <unit bldFile="qtinternetradio/internal/tsrc" qt:proFile="tsrc.pro" qt:qmakeArgs="-r" filter="TA_InternetRadio"/> -->
      </component>
     </collection>
   </package>
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/app/jrt/package_definition.xml
--- a/symbian4/app/jrt/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/app/jrt/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -15,7 +15,11 @@
     <unit bldFile="jrt_plat/java_debug_api/build"/>
    </component>
   </collection>
-
+   <collection id="java_stubs" name="Java Stubs" level="rt">
+   <component id="java_stubs_build"  name="Build Native Java" filter="sf_build" introduced="^4">
+      <unit bldFile="java_stubs/group"/>
+   </component>
+  </collection>
    <collection id="build_nativejava" name="Build Native Java">
    <component id="nativejava"  name="Build Native Java" filter="s60" introduced="^4">
       <unit bldFile="build/nativejava" qt:proFile="nativejava.pro" qt:qmakeArgs="-r" filter="!sf_build"/>
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/app/messaging/package_definition.xml
--- a/symbian4/app/messaging/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/app/messaging/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -128,9 +128,8 @@
    </component>
   </collection>
   <collection id="messagingapp" name="Messaging Application" level="app">
-   <component id="messagingapp_build" filter="s60" name="MMS Engine Build">
-    <!-- this should be broken up into the individual other components -->
-    <unit bldFile="messagingapp" qt:proFile="messagingapp.pro" qt:qmakeArgs="-r"/>
+   <component id="messaging_conf" filter="s60" name="Messaging Application Configuration" class="config" introduced="^4">
+    <unit bldFile="messagingapp/conf" qt:proFile="messaging_conf.pro" qt:qmakeArgs="-r"/>
    </component>
      <component id="msgutils" filter="s60" name="Messaging Utils" introduced="^4">
       <unit bldFile="messagingapp/msgutils" qt:proFile="msgutils.pro" qt:qmakeArgs="-r"/>
@@ -153,6 +152,9 @@
      <component id="msgui" filter="s60" name="Messaging UI" introduced="^4">
       <unit bldFile="messagingapp/msgui" qt:proFile="msgui.pro" qt:qmakeArgs="-r"/>
      </component>
+     <component id="msgservices" filter="s60" name="Messaging Services" introduced="^4">
+      <unit bldFile="messagingapp/msgservices" qt:proFile="msgservices.pro" qt:qmakeArgs="-r"/>
+     </component>
   </collection>
   <collection id="email" name="Email" level="plugin">
    <!-- use commonemail instead -->
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/app/musicplayer/package_definition.xml
--- a/symbian4/app/musicplayer/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/app/musicplayer/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="musicplayer" name="Music Player Apps" levels="plugins support hs app">
-	<!-- move the export .pri files into their components and uncomment the units -->
+ <package id="musicplayer" name="Music Player Apps" levels="plugins support engine app">
+	<!-- move the rom .pri files into their components and uncomment the units -->
 
   <collection id="musicplayer_utilities " name="Music Player Utilities" level="support">
    <component id="mpnowplayingbanner" filter="s60" name="MP Now Playing Banner" introduced="^4">
@@ -11,10 +11,10 @@
 	<!-- <unit bldFile="utilities/mpsettingsmanager" qt:proFile="mpsettingsmanager.pro" qt:qmakeArgs="-r -config rom"/> -->
    </component>
   </collection>
-  <collection id="musicfetcher " name="Music Fetcher" level="support">
+  <collection id="musicservices " name="Music Services" level="support">
 	<!-- collection is really a component, move down a directory -->
-   <component id="musicfetcher_buld" filter="s60" name="Music Fetcher Build" introduced="^4">
-	<!-- <unit bldFile="musicfetcher" qt:proFile="musicfetcher.pro" qt:qmakeArgs="-r -config rom"/> -->
+   <component id="musicservices_build" filter="s60" name="Music Services Build" introduced="^4">
+	<!-- <unit bldFile="musicservices" qt:proFile="musicservices.pro" qt:qmakeArgs="-r -config rom"/> -->
    </component>
   </collection>
   <collection id="musicplayer_app " name="Music Player Application" level="app">
@@ -23,12 +23,33 @@
 	<!-- <unit bldFile="app" qt:proFile="app.pro" qt:qmakeArgs="-r -config rom"/> -->
    </component>
   </collection>
-  <collection id="mpviewplugins " name="Music Player View Plugins" level="plugins">
+  <collection id="mpdata " name="Music Player Data" level="support">
+	<!-- collection is really a component, move down a directory -->
+   <component id="mpdata_build" filter="s60" name="Music Player Data Build" introduced="^4">
+	<!-- <unit bldFile="mpdata" qt:proFile="mpdata.pro" qt:qmakeArgs="-r -config rom"/> -->
+   </component>
+  </collection>
+  <collection id="mpengine " name="Music Player Engine" level="engine">
+	<!-- collection is really a component, move down a directory -->
+   <component id="mpengine_build" filter="s60" name="Music Player Engine Build" introduced="^4">
+	<!-- <unit bldFile="mpengine" qt:proFile="mpengine.pro" qt:qmakeArgs="-r -config rom"/> -->
+   </component>
+  </collection>
+  <collection id="mpviewplugins" name="Music Player View Plugins" level="plugins">
    <component id="mpcollectionviewplugin" filter="s60" name="MP Collection View Plugin" introduced="^4" class="plugin">
-    <!--<unit bldFile="mpviewplugins/mpcollectionviewplugin/group"/>-->
+    <!--<unit bldFile="mpviewplugins/mpcollectionviewplugin" qt:proFile="mpcollectionviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
    </component>
    <component id="mpplaybackviewplugin" filter="s60" name="MP Playback View Plugin" introduced="^4" class="plugin">
-    <!--<unit bldFile="mpviewplugins/mpplaybackviewplugin/group"/>-->
+    <!--<unit bldFile="mpviewplugins/mpplaybackviewplugin" qt:proFile="mpplaybackviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
+   </component>
+   <component id="mpsettingsviewplugin" filter="s60" name="MP Settings View Plugin" introduced="^4" class="plugin">
+    <!--<unit bldFile="mpviewplugins/mpsettingsviewplugin" qt:proFile="mpsettingsviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
+   </component>
+   <component id="mpdetailsviewplugin" filter="s60" name="MP Details View Plugin" introduced="^4" class="plugin">
+    <!--<unit bldFile="mpviewplugins/mpdetailsviewplugin" qt:proFile="mpdetailsviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
+   </component>
+   <component id="mpmediawallviewplugin" filter="s60" name="MP Media Wall View Plugin" introduced="^4" class="plugin">
+    <!--<unit bldFile="mpviewplugins/mpmediawallviewplugin" qt:proFile="mpmediawallviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
    </component>
   </collection>
   <collection id="mpserviceplugins" name="Music Player Service Plugins" level="plugins">
@@ -42,19 +63,25 @@
    <component id="mpxsqlitedbcommon" filter="s60" name="MPX SQLite Database Common" introduced="^4">
     <!--<unit bldFile="mpserviceplugins/mpxsqlitedbcommon/group"/>-->
    </component>
+   <component id="mpxsqlitedbhgplugin" filter="s60" name="MPX SQLite Database Hg Plugin" introduced="^4" class="plugin">
+    <!--<unit bldFile="mpserviceplugins/mpxsqlitedbhgplugin/group"/>-->
+   </component>
    <component id="mpxsqlitedbplugin" filter="s60" name="MPX SQLite Database Plugin" introduced="^4" class="plugin">
     <!--<unit bldFile="mpserviceplugins/mpxsqlitedbplugin/group"/>-->
    </component>
    <component id="mpxsqlitepodcastdbplugin" filter="s60" name="MPX SQLlite Podcast Database Plugin" introduced="^4" class="plugin">
     <!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
    </component>
+   <component id="mpxinmemoryplugin" filter="s60" name="MPX In-Memory Plugin" introduced="^4" class="plugin">
+    <!--<unit bldFile="mpserviceplugins/mpxinmemoryplugin/group"/>-->
+   </component>
    <component id="m3uplaylistplugin" filter="s60" name="M3U Playlist Plugin" introduced="^4" class="plugin">
     <!--<unit bldFile="mpserviceplugins/mpxsqlitepodcastdbplugin/group"/>-->
    </component>
   </collection>
   <collection id="musicplayer_info" name="Music Player Apps Info" level="app">
    <component id="musicplayer_build" filter="s60" name="Music Player Build">
-    <!-- should brak up into individual components  -->
+    <!-- break up into individual components. ROM includes should be in their components -->
 	<unit bldFile="." qt:proFile="qtmusicplayer.pro" qt:qmakeArgs="-r -config rom"/>
    </component>
   </collection>
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/app/organizer/package_definition.xml
--- a/symbian4/app/organizer/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/app/organizer/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -10,7 +10,10 @@
   </collection>
   <collection id="organizer_plat" name="Organizer Application Suite Platform Interfaces" level="app">
    <component id="organizer_plat_build" name="Organizer Application Suite Platform Interface Build" class="api" filter="s60">
-		<!-- break up into individual .pro files -->
+    <meta rel="Api" href="organizer_plat/agenda_versit_2_api/agenda_versit_2_api.metaxml"/>
+    <meta rel="Api" href="organizer_plat/calendar_exporter_api/calendar_exporter_api.metaxml"/>
+    <meta rel="Api" href="organizer_plat/calendar_importer_api/calendar_importer_api.metaxml"/>
+		<!-- break up into individual .pro files, move the above metaxmls to those components -->
     <unit bldFile="organizer_plat" qt:proFile="organizer_plat.pro"/>
    </component>
    <component id="agenda_versit_2_api" name="Agenda Versit 2 API" class="api" filter="s60">
@@ -121,9 +124,6 @@
    <component id="clockui" filter="s60" name="Clock UI">
     <!--<unit bldFile="clock/clockui" qt:proFile="clockui.pro"/>-->
    </component>
-   <component id="ftudatetimewizard" filter="s60" name="First Time Use Date/Time Wizard" introduced="^4">
-    <!--<unit bldFile="clock/ftudatetimewizard" qt:proFile="ftudatetimewizard.pro"/>-->
-   </component>
    <component id="clock_build" filter="s60" name="Clock Build">
     <!-- make exports into a component, or just move to one of the above components, then remove this and uncomment the above -->
     <unit bldFile="clock" qt:proFile="clock.pro"/>
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/app/photos/package_definition.xml
--- a/symbian4/app/photos/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/app/photos/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -38,6 +38,11 @@
     <!--<unit bldFile="main" qt:proFile="main.pro"/> -->
    </component>
   </collection>
+  <collection id="gallery" name="Gallery" level="ui">
+   <component id="gallery_build" filter="s60" name="Gallery Build" introduced="^4">
+    <!--<unit bldFile="gallery" qt:proFile="gallery.pro"/> -->
+   </component>
+  </collection>
   <collection id="imageviewerapp" name="Image Viewer App" level="support">
    <component id="imageviewerapp_build" filter="s60" name="Image Viewer App Build" introduced="^4">
     <!--<unit bldFile="imageviewerapp" qt:proFile="imageviewerapp.pro"/> -->
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/app/radio/package_definition.xml
--- a/symbian4/app/radio/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/app/radio/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
-  <package id="radio" name="Radio Apps" levels="engine ui">
+  <package id="radio" name="Radio Apps" levels="engine plugin ui">
     <collection id="radioengine" name="Radio Engine" level="engine">
       <component id="radioengineutils" filter="s60" name="Radio Engine Utils" introduced="^4">
         <unit bldFile="radioengine/utils/group"/>
@@ -32,5 +32,16 @@
         <unit bldFile="rom"/>
       </component>
     </collection>
+    <collection id="radio_hswidgetplugin" name="FM Radio Homescreen Widget Plugin" level="plugin">
+      <component id="fmradiohswidgetplugin" filter="s60" name="FM Radio HS Widget Plugin" class="plugin" introduced="^4">
+        <unit bldFile="hswidgetplugin/fmradiohswidgetplugin" qt:proFile="fmradiohswidgetplugin.pro"/>
+      </component>
+      <component id="fmradiohswidgetplugininstaller" filter="s60" name="FM Radio HS Widget Plugin Installer" introduced="^4">
+        <unit bldFile="hswidgetplugin/fmradiohswidgetplugininstaller" qt:proFile="fmradiohswidgetplugininstaller.pro"/>
+      </component>
+      <component id="fmradiohswidgetplugin_exports_to_rom" filter="s60" name="FM Radio HS Widget Plugin ROM" introduced="^4">
+        <unit bldFile="hswidgetplugin" qt:proFile="fmradiohswidgetplugin_exports_to_rom.pri"/>
+      </component>
+    </collection>
   </package>
 </SystemDefinition>
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/app/recents/package_definition.xml
--- a/symbian4/app/recents/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/app/recents/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -16,8 +16,20 @@
    </component>
   </collection>
   <collection id="logsui" name="Logs UI" level="ui">
+    <!-- split into actual components -->
+   <component id="logsservices" filter="s60" name="Logs Services" introduced="^4">
+     <!-- <unit bldFile="logsui/logsservices" qt:proFile="logsui.pro"/> -->
+   </component>
+   <component id="logscntfinder" filter="s60" name="Logs Contact finder">
+    <!--<unit bldFile="logsui/logscntfinder" qt:proFile="logscntfinder.pro"/> -->
+   </component>
+   <component id="logsengine" filter="s60" name="Logs Engine" introduced="^4">
+    <!--<unit bldFile="logsui/logsengine" qt:proFile="logsengine.pro"/> -->
+   </component>
+   <component id="logsapp" filter="s60" name="Logs Application">
+    <!--<unit bldFile="logsui/logsengine" qt:proFile="logsengine.pro"/> -->
+   </component>
    <component id="logsui_build" filter="s60" name="Logs UI Build">
-    <!-- component at too high a rank, should move down one directory -->
     <unit bldFile="logsui" qt:proFile="logsui.pro"/>
    </component>
   </collection>
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/app/rndtools/package_definition.xml
--- a/symbian4/app/rndtools/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/app/rndtools/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -3,40 +3,25 @@
     <collection id="creator" name="Creator" level="support">
 	   	<!-- collection is really a component. Should move down a directory -->
       <component id="creator_build" filter="s60" name="Creator Tool" purpose="development" target="device" class="tool">
-        <unit bldFile="creator" qt:qmakeArgs="-r" qt:proFile="creator.pro"/>
+        <unit bldFile="creator" qt:proFile="creator.pro"/>
       </component>
     </collection>
     <collection id="filebrowser" name="File Browser" level="util">
-		<!-- consider collapsing into a single component -->
-      <component id="fileopserver" filter="s60" name="File Operations Server" purpose="development" target="device" class="tool">
-      	<meta rel="config">
-      		<not-defined condition="FILEBROWSER_LITE"/>
-      	</meta>
-      	<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-        <!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
-      </component>
-      <component id="fileopclient" filter="s60" name="File Operations Client" purpose="development" target="device" class="tool">
-      	<meta rel="config">
-      		<not-defined condition="FILEBROWSER_LITE"/>
-      	</meta>
-      	<!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
-        <!--<unit bldFile="filebrowser/fileopclient/group"/>-->
-      </component>
-      <component id="filebrowser_build" filter="s60" name="File Browser Application" purpose="development" target="device" class="tool">
-		<!-- Need to make this a self-contained component by removing #includes. Can only do when configuration is in place-->
-        <unit bldFile="filebrowser/group"/>
+	   	<!-- collection is really a component. Should move down a directory -->
+      <component id="filebrowser_build" filter="s60" name="File Browser Build" purpose="development" target="device" class="tool">
+        <unit bldFile="filebrowser" qt:proFile="filebrowser.pro" />
       </component>
     </collection>
     <collection id="launcher" name="Launcher" level="util">
 	   	<!-- collection is really a component. Should move down a directory -->
       <component id="launcher_build" filter="s60" name="Launcher Utility" purpose="development" target="device" class="tool">
-        <unit bldFile="launcher/group"/>
+        <unit bldFile="launcher" qt:proFile="launcher.pro" />
       </component>
     </collection>
     <collection id="loadgen" name="Load Generator" level="test">
 	   	<!-- collection is really a component. Should move down a directory -->
       <component id="loadgen_build" filter="s60" name="Load Generator Application" purpose="development" target="device" class="tool">
-        <unit bldFile="loadgen/group"/>
+        <unit bldFile="loadgen" qt:proFile="loadgen.pro" />
       </component>
     </collection>
     <collection id="perfmon" name="Performance Monitor" level="test">
@@ -45,6 +30,12 @@
            <unit bldFile="perfmon" qt:proFile="perfmon.pro"/>
       </component>
     </collection>
+    <collection id="piprofilerui" name="Performance Investigator Profiler UI" level="generic">
+	   	<!-- collection is really a component. Should move down a directory -->
+      <component id="piprofilerui_build" filter="s60" name="Performance Investigator Profiler UI Build" purpose="development" target="device" introduced="^4">
+			<unit bldFile="piprofilerui" qt:proFile="piprofilerui.pro" />
+      </component>
+    </collection>
     <collection id="screengrabber" name="Screen Grabber" level="util">
 	   	<!-- collection is really a component. Should move down a directory -->
       <component id="screengrabber_build" filter="s60"  name="ScreenGrabber" purpose="development" target="device" class="tool">
@@ -52,30 +43,23 @@
       </component>
     </collection>
     <collection id="stifui" name="STIF UI" level="generic">
-      <component id="stifui_avkon" filter="s60" name="STIF UI for Avkon" purpose="development" target="device">
-        <unit bldFile="stifui/akvon/group"/>
+      <component id="stifuiqt" filter="s60" name="STIF Qt UI" purpose="development" target="device" introduced="^4">
+		<unit bldFile="stifui/qt" qt:proFile="stifqtui.pro" /> <!-- should use stifuiqt as the dir name -->
       </component>
-   </collection>
+    </collection>
+    <collection id="memspyui" name="Memspy UI" level="generic">
+	   	<!-- collection is really a component. Should move down a directory -->
+      <component id="memspyui_build" filter="s60" name="Memspy UI Application" purpose="development" target="device" class="tool">
+        <unit bldFile="memspyui" qt:proFile="memspyui.pro" />
+      </component>
+    </collection>
     <collection id="htiui" name="Harmonized Test Interface UI" level="generic">
-      <component id="HtiServicePlugins" filter="s60" name="HTI Service Plugins" purpose="development" target="device" class="plugin">
-		<!-- can only have a single unit. Should #include from a common bld.inf file -->
-        <unit bldFile="htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
-        <unit bldFile="htiui/HtiServicePlugins/HtiAudioServicePlugin/group"/>
-        <unit bldFile="htiui/HtiServicePlugins/HtiKeyEventServicePlugin/group"/>
-        <unit bldFile="htiui/HtiServicePlugins/HtiMessagesServicePlugin/group"/>
-        <unit bldFile="htiui/HtiServicePlugins/HtiPIMServicePlugin/group"/>
-        <unit bldFile="htiui/HtiServicePlugins/HtiScreenshotServicePlugin/group"/>
-        <unit bldFile="htiui/HtiServicePlugins/HtiSysInfoServicePlugin/group"/>
-        <unit bldFile="htiui/HtiServicePlugins/HtiFtpBackupFake/group"/>
+      <component id="htiui_build" filter="s60" name="HTI UI Build" purpose="development" target="device">
+		<!-- should split up into individual components -->
+        <unit bldFile="htiui/group"/>
       </component>
-      <component id="htidevicereboot" filter="s60" name="HTI Device Reboot" purpose="development" target="device">
-        <unit bldFile="htiui/htidevicereboot/group"/>
-      </component>
-      <component id="htistartupwait" filter="s60" name="HTI Startup Wait" purpose="development" target="device">
-        <unit bldFile="htiui/htistartupwait/group"/>
-      </component>
-      <component id="htiadmin" filter="s60" name="HTI Admin" purpose="development" target="device">
-        <unit bldFile="htiui/htiadmin/group"/>
+      <component id="htiadminqt" filter="s60" name="HTI Admin Qt" purpose="development" target="device">
+        <unit bldFile="htiui/htiadminqt" qt:proFile="HtiAdmin.pro"/>
       </component>
     </collection>
   </package>
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/mw/accesssec/package_definition.xml
--- a/symbian4/mw/accesssec/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/mw/accesssec/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+<SystemDefinition schema="3.0.0"  xmlns:qt="http://www.nokia.com/qt">
  <package id="accesssec" name="Access Security" levels="plugin framework server generic specific">
   <collection id="accesssec_plat" name="Access Security Platform Interfaces" level="specific">
    <component id="eap_vpn_api" name="EAP VPN API" class="api" filter="s60">
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/mw/appinstall/package_definition.xml
--- a/symbian4/mw/appinstall/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/mw/appinstall/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -34,10 +34,6 @@
     <meta rel="Api" href="appinstall_plat/sw_installer_ps_keys/sw_installer_ps_keys.metaxml"/>
     <unit bldFile="appinstall_plat/sw_installer_ps_keys/group"/>
    </component>
-   <component id="appmngr2runtimeapi" name="Application Manager 2 Runtime Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="appinstall_plat/appmngr2runtimeapi/appmngr2runtimeapi.metaxml"/>
-    <unit bldFile="appinstall_plat/appmngr2runtimeapi/group"/>
-   </component>
    <component id="sifui_api" name="STIF UI API" class="api" filter="s60">
     <unit bldFile="appinstall_plat/sifui_api/group"/>
    </component>
@@ -49,13 +45,7 @@
    </component>
   </collection>
     <collection id="ncdengine" name="Nokia Content Discover" level="framework">
-    	<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-      <component id="ncdengine_engine" filter="s60" name="NCD Engine" introduced="^1">
-        <unit bldFile="ncdengine/engine/group"/>
-      </component>
-      <component id="debuglogger" filter="s60" name="NCD Debug Logger" introduced="^1">
-        <!-- <unit bldFile="ncdengine/debuglogger/group"/> -->
-      </component>
+    	<!-- collection is really just a component. Move down one diretcory -->
       <component id="ncdengine_build" filter="s60" name="NCD Build" introduced="^1">
         <unit bldFile="ncdengine/group"/>
       </component>
@@ -64,6 +54,9 @@
       <component id="appinstui" filter="s60" name="Application Installer UI" introduced="^2">
         <unit bldFile="appinstaller/appinstui/group"/>
       </component>
+      <component id="appinstui_qt" filter="s60" name="Application Installer Qt UI" introduced="^2">
+        <unit bldFile="appinstaller/appinstui" qt:proFile="appinstui.pro" qt:qmakeArgs="-r"/>
+      </component>
     </collection>
     <collection id="iaupdateapi_stub" name="IA Update API Stub" level="api">
     	<!-- the collection is really a component. Move down a directory.-->
@@ -72,12 +65,9 @@
       </component>
     </collection>
     <collection id="iaupdate" name="Independent Apps Update" level="api">
-    	<!-- is this really just a component? If so move down one diretcory. Otherwise properly split up the bld.inf -->
-      <component id="iad" name="Software Update" filter="s60" introduced="^2">
-        <unit bldFile="iaupdate/iad/group"/>
-      </component>
-      <component id="iaupdate_help" filter="s60" name="IA Update Help" introduced="^2">
-        <unit bldFile="iaupdate/help/group"/>
+    	<!-- Should reorganise into actual components -->
+      <component id="iad" name="Independent App delivery" filter="s60" introduced="^4" purpose="development">
+        <unit bldFile="iaupdate" qt:proFile="iaupdate.pro" qt:qmakeArgs="-r"/>
       </component>
       <component id="iaupdate_build" filter="s60" name="IA Update Build" introduced="^2">
         <unit bldFile="iaupdate/group"/>
@@ -127,9 +117,6 @@
       </component>
     </collection>
     <collection id="appinstall_info" name="Application Installation Info" level="api">
-      <component id="appinstall_qt" filter="s60,test,api_test" name="Application Installation Qt">
-        <unit bldFile="." qt:proFile="appinstall.pro" qt:qmakeArgs="-r"/>
-      </component>
       <component id="appinstall_test" filter="s60,test,api_test" name="Application Installation Test" purpose="development">
         <unit bldFile="tsrc/group"/>
       </component>
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/mw/appsupport/package_definition.xml
--- a/symbian4/mw/appsupport/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/mw/appsupport/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -140,22 +140,17 @@
    </component>
   </collection>
   <collection id="contextframework" name="Context Framework" level="framework">
-   <!-- the units that are commented out need to be put back when configuration is in place.
-		They're currently #included by contextframework_build, which should be removed when the other units are uncommented -->
    <component id="cfw" filter="s60" name="Context Framework">
     <meta rel="config">
      <defined condition="RD_CONTEXT_FRAMEWORK"/>
     </meta>
-    <!--<unit bldFile="contextframework/cfw/group"/> -->
+    <unit bldFile="contextframework/cfw/group"/>
    </component>
    <component id="cfwplugins" filter="s60" name="Context Framework Plugins" class="plugin">
     <meta rel="config">
      <defined condition="RD_CONTEXT_FRAMEWORK"/>
     </meta>
-    <!--<unit bldFile="contextframework/cfwplugins/group"/>-->
-   </component>
-   <component id="contextframework_build" filter="s60" name="Context Framework Build">
-    <unit bldFile="contextframework/group"/>
+    <unit bldFile="contextframework/cfwplugins/group"/>
    </component>
   </collection>
   <collection id="coreapplicationuis" name="Core Application UIs" level="server">
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/mw/btservices/package_definition.xml
--- a/symbian4/mw/btservices/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/mw/btservices/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
  <package id="btservices" name="Bluetooth Services" levels="framework server generic specific plugin">
   <collection id="btservices_pub" name="BT Services Public Interfaces" level="plugin">
    <component id="bluetooth_power_state_api" name="Bluetooth Power State API" class="api" filter="s60">
@@ -66,12 +66,22 @@
    </component>
   </collection>
   <collection id="bluetoothengine" name="Bluetooth Engine" level="framework">
+   <component id="btnotifclient" filter="s60" name="Bluetooth Notification Client" introduced="^4">
+	<!-- cannot put a component under another component. Move up a directory -->
+    <unit bldFile="bluetoothengine/btnotif/btnotifclient/group"/>
+   </component>
    <component id="bteng" filter="s60" name="Bluetooth Engine">
     <unit bldFile="bluetoothengine/bteng/group"/>
    </component>
+   <component id="btserviceutil" filter="s60" name="Bluetooth Service Utils" introduced="^4">
+    <unit bldFile="bluetoothengine/btserviceutil/group"/>
+   </component>
    <component id="btnotif" filter="s60" name="Bluetooth Notifier">
     <unit bldFile="bluetoothengine/btnotif/group"/>
    </component>
+   <component id="btdevicedialogplugin" filter="s60" name="Bluetooth Device Dialog Plugin" class="plugin" introduced="^4">
+    <unit bldFile="bluetoothengine/btnotif/btdevicedialogplugin" qt:proFile="btdevicedialogplugin.pro"/>
+   </component>
    <component id="btaudioman" filter="s60" name="Bluetooth Audio Manager">
     <unit bldFile="bluetoothengine/btaudioman/group"/>
    </component>
@@ -88,7 +98,7 @@
     <unit bldFile="bluetoothengine/btsap/group"/>
    </component>
    <component id="btui" filter="s60" name="Bluetooth UI">
-    <unit bldFile="bluetoothengine/btui/group"/>
+	 <unit  bldFile="bluetoothengine/btui" qt:proFile="btui.pro" />
    </component>
    <component id="btpbap" filter="s60" name="Bluetooth Phonebook Access Profile" class="plugin">
     <unit bldFile="bluetoothengine/btpbap/group"/>
@@ -99,12 +109,6 @@
    <component id="btctrldcmoadapter" filter="s60" name="Bluetooth Control DCMO Adapter" class="plugin" introduced="^3">
     <unit bldFile="bluetoothengine/btctrldcmoadapter/group"/>
    </component>
-   <component id="btserviceutil" filter="s60" name="Bluetooth Service Utils">
-    <unit bldFile="bluetoothengine/btserviceutil/group"/>
-   </component>
-   <component id="btnotifclient" filter="s60" name="Bluetooth Notifier Client">
-    <unit bldFile="bluetoothengine/btnotif/btnotifclient/group"/>
-   </component>
   </collection>
   <collection id="bluetoothappprofiles" name="Bluetooth Application Profiles" level="plugin">
    <component id="avrcp" name="Bluetooth AVRCP" introduced="9.1" purpose="optional">
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/mw/classicui/package_definition.xml
--- a/symbian4/mw/classicui/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/mw/classicui/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -2,10 +2,6 @@
 <SystemDefinition schema="3.0.0">
  <package id="classicui" name="Classic UI" levels="base support server generic specific">
   <collection id="classicui_plat" name="Classic UI Platform Interfaces" level="specific">
-   <component id="personalisation_framework_api" name="Personalisation Framework API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/personalisation_framework_api/personalisation_framework_api.metaxml"/>
-    <unit bldFile="classicui_plat/personalisation_framework_api/group"/>
-   </component>
    <component id="signal_pane_api" name="Signal Pane API" class="api" filter="s60">
     <meta rel="Api" href="classicui_plat/signal_pane_api/signal_pane_api.metaxml"/>
     <unit bldFile="classicui_plat/signal_pane_api/group" filter="!test"/>
@@ -36,19 +32,11 @@
     <unit bldFile="classicui_plat/extended_utilities_api/group" filter="!test"/>
     <unit bldFile="classicui_plat/extended_utilities_api/tsrc/group" filter="test,api_test"/>
    </component>
-   <component id="personalisation_plugin_api" name="Personalisation Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/personalisation_plugin_api/personalisation_plugin_api.metaxml"/>
-    <unit bldFile="classicui_plat/personalisation_plugin_api/group"/>
-   </component>
    <component id="extended_aiw_criteria_api" name="Extended AIW Criteria API" class="api" filter="s60">
     <meta rel="Api" href="classicui_plat/extended_aiw_criteria_api/extended_aiw_criteria_api.metaxml"/>
     <unit bldFile="classicui_plat/extended_aiw_criteria_api/group" filter="!test"/>
     <unit bldFile="classicui_plat/extended_aiw_criteria_api/tsrc/group" filter="test,api_test"/>
    </component>
-   <component id="personalisation_application_api" name="Personalisation Application API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/personalisation_application_api/personalisation_application_api.metaxml"/>
-    <unit bldFile="classicui_plat/personalisation_application_api/group"/>
-   </component>
    <component id="volume_popup_api" name="Volume Popup API" class="api" filter="s60">
     <meta rel="Api" href="classicui_plat/volume_popup_api/volume_popup_api.metaxml"/>
     <unit bldFile="classicui_plat/volume_popup_api/group" filter="!test"/>
@@ -99,10 +87,6 @@
     <unit bldFile="classicui_plat/task_list_api/group" filter="!test"/>
     <unit bldFile="classicui_plat/task_list_api/tsrc/group" filter="test,api_test"/>
    </component>
-   <component id="personalisation_slide_show_dialog_api" name="Personalisation Slide Show Dialog API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/personalisation_slide_show_dialog_api/personalisation_slide_show_dialog_api.metaxml"/>
-    <unit bldFile="classicui_plat/personalisation_slide_show_dialog_api/group"/>
-   </component>
    <component id="key_event_utilities_api" name="Key Event Utilities API" class="api" filter="s60">
     <meta rel="Api" href="classicui_plat/key_event_utilities_api/key_event_utilities_api.metaxml"/>
     <unit bldFile="classicui_plat/key_event_utilities_api/group"/>
@@ -178,10 +162,6 @@
     <meta rel="Api" href="classicui_plat/fep_document_navigation_api/fep_document_navigation_api.metaxml"/>
     <unit bldFile="classicui_plat/fep_document_navigation_api/group"/>
    </component>
-   <component id="personalisation_localised_texts_api" name="Personalisation Localised Texts API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/personalisation_localised_texts_api/personalisation_localised_texts_api.metaxml"/>
-    <unit bldFile="classicui_plat/personalisation_localised_texts_api/group"/>
-   </component>
    <component id="memory_card_ui_api" name="Memory Card UI API" class="api" filter="s60">
     <meta rel="Api" href="classicui_plat/memory_card_ui_api/memory_card_ui_api.metaxml"/>
     <unit bldFile="classicui_plat/memory_card_ui_api/group" filter="!test"/>
@@ -404,6 +384,14 @@
     <unit bldFile="classicui_plat/extended_options_menu_api/group" filter="!test"/>
     <unit bldFile="classicui_plat/extended_options_menu_api/tsrc/group" filter="test,api_test"/>
    </component>
+   <component id="directory_localizer_api" class="api" name="Directory Localizer API" filter="s60">
+      <meta rel="Api" href="classicui_plat/directory_localizer_api/directory_localizer_api.metaxml"/>
+      <unit bldFile="classicui_plat/directory_localizer_api/group"/>
+   </component>
+   <component id="findutil_api" class="api" name="Find Util API" filter="s60">
+      <meta rel="Api" href="classicui_plat/findutil_api/findutil_api.metaxml"/>
+      <unit bldFile="classicui_plat/findutil_api/group"/>
+   </component>
   </collection>
   <collection id="classicui_pub" name="Classic UI Public Interfaces" level="specific">
    <component id="input_frame_api" name="Input Frame API" class="api" filter="s60">
@@ -747,12 +735,6 @@
     <unit bldFile="applicationinterworkingfw/servicehandler/group"/>
    </component>
   </collection>
-  <collection id="psln" name="Personalization" level="specific">
-   <!-- the collection is really a component. Move down a directory. Or it could be split into multiple components-->
-   <component id="psln_build" filter="s60" name="Personalization Build">
-    <unit bldFile="psln/group"/>
-   </component>
-  </collection>
   <collection id="commonadapter" name="Common Adapter" level="support">
    <!-- the collection is really a component. Move down a directory.-->
    <component id="commonadapter_build" filter="s60" name="Common Adapter Build">
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/mw/dlnasrv/package_definition.xml
--- a/symbian4/mw/dlnasrv/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/mw/dlnasrv/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -92,31 +92,31 @@
     <meta rel="config">
      <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
     </meta>
-    <!-- <unit bldFile="upnpframework/upnpextensionpluginif/group"/> -->
+    <unit bldFile="upnpframework/upnpextensionpluginif/group"/>
    </component>
    <component id="upnpfiletransferengine" filter="s60" name="UPnP File Transfer Engine" introduced="^2" deprecated="^3">
     <meta rel="config">
      <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
     </meta>
-    <!-- <unit bldFile="upnpframework/upnpfiletransferengine/group"/>-->
+    <unit bldFile="upnpframework/upnpfiletransferengine/group"/>
    </component>
    <component id="upnpcommonui" filter="s60" name="UPnP Common UI" introduced="^2" deprecated="^3">
     <meta rel="config">
      <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
     </meta>
-    <!--<unit bldFile="upnpframework/upnpcommonui/group"/>-->
+    <unit bldFile="upnpframework/upnpcommonui/group"/>
    </component>
    <component id="upnpaiwengine" filter="s60" name="UPnP AIW Engine" introduced="^2" deprecated="^3">
     <meta rel="config">
      <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
     </meta>
-    <!--<unit bldFile="upnpframework/upnpaiwengine/group"/> -->
+    <unit bldFile="upnpframework/upnpaiwengine/group"/>
    </component>
    <component id="upnpaiwprovider" filter="s60" name="UPnP AIW Provider" class="plugin" introduced="^2" deprecated="^3">
     <meta rel="config">
      <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
     </meta>
-    <!--<unit bldFile="upnpframework/upnpaiwprovider/group"/>-->
+    <unit bldFile="upnpframework/upnpaiwprovider/group"/>
    </component>
    <component id="upnpmusicadapter" filter="s60" name="UPnP Music Adapter" introduced="^2">
     <unit bldFile="upnpframework/upnpmusicadapter/group"/>
@@ -125,7 +125,7 @@
     <unit bldFile="upnpframework/upnpcommand/group"/>
    </component>
    <component id="upnpframework_build" filter="s60" name="UPnP Framework Build" introduced="^2">
-    <!-- move exports content into one of above components -->
+    <!-- move exports content into one or more of above components -->
     <unit bldFile="upnpframework/group"/>
    </component>
   </collection>
@@ -137,21 +137,24 @@
     <meta rel="config">
      <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
     </meta>
-    <!--<unit bldFile="upnpsettings/multiselectionui/group"/>-->
+    <unit bldFile="upnpsettings/multiselectionui/group"/>
    </component>
    <component id="appwizard" filter="s60" name="UPnP Settings Wizard App" introduced="^2" deprecated="^3">
     <meta rel="config">
      <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
     </meta>
-    <!--<unit bldFile="upnpsettings/appwizard/group"/>-->
+    <unit bldFile="upnpsettings/appwizard/group"/>
    </component>
    <component id="upnpsharingui" filter="s60" name="UPnP Sharing UI" introduced="^2" deprecated="^3">
     <meta rel="config">
      <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
     </meta>
-    <!--<unit bldFile="upnpsettings/upnpsharingui/group"/>-->
+    <unit bldFile="upnpsettings/upnpsharingui/group"/>
    </component>
    <component id="upnpgsplugin" filter="s60" name="UPnP GS Plugin" class="plugin" introduced="^2">
+    <meta rel="config">
+     <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
+    </meta>
     <unit bldFile="upnpsettings/upnpgsplugin/group"/>
    </component>
    <component id="upnpsettings_build" filter="s60" name="UPnP Settings Build" introduced="^2">
@@ -192,20 +195,20 @@
    </meta>
    <component id="upnpharvester_common" filter="s60" name="UPnP Harvester Common" introduced="^2" deprecated="^3">
     <!-- need to merge or #include these to a single bld.inf -->
-    <!--<unit bldFile="upnpharvester/common/cmlibrary/group"/>
+    <unit bldFile="upnpharvester/common/cmlibrary/group"/>
         <unit bldFile="upnpharvester/common/cmsettings/group"/>
         <unit bldFile="upnpharvester/common/cmsqlwrapper/group"/>
-        <unit bldFile="upnpharvester/common/dbmanager/group"/>-->
+        <unit bldFile="upnpharvester/common/dbmanager/group"/>
    </component>
    <component id="cdssync" filter="s60" name="CDS Sync" introduced="^2" deprecated="^3">
-    <!-- <unit bldFile="upnpharvester/cdssync/common"/>-->
+    <unit bldFile="upnpharvester/cdssync/common"/>
    </component>
    <component id="mdhserver" filter="s60" name="Metadata Harvester Server" introduced="^2" deprecated="^3">
-    <!--<unit bldFile="upnpharvester/mdhserver/group"/>-->
+    <unit bldFile="upnpharvester/mdhserver/group"/>
    </component>
    <component id="upnpharvester_build" filter="s60" name="UPnP Harvester Build" introduced="^2" deprecated="^3">
     <!-- could just make the whole collection one component and move down a dir. Or move the exports here into the other component -->
-    <!--<unit bldFile="upnpharvester/group"/>-->
+    <unit bldFile="upnpharvester/group"/>
    </component>
   </collection>
   <collection id="homesync" name="Home Sync" level="plugin">
@@ -213,7 +216,7 @@
     <defined condition="FF_UPNP_FRAMEWORK_2_0"/>
    </meta>
    <component id="contentmanager" filter="s60" name="Content Manager" introduced="^2" deprecated="^3">
-        <!-- <unit bldFile="homesync/group"/>-->  <!-- move bld.inf into contentmanager dir -->
+        <unit bldFile="homesync/group"/> <!-- move bld.inf into contentmanager dir -->
    </component>
   </collection>
   <collection id="homemedia" name="Home Media" level="framework">
@@ -222,14 +225,10 @@
    </meta>
    <!-- collection is really just a component. Move down a directory -->
    <component id="homemedia_build" filter="s60" name="Home Media" introduced="^2" deprecated="^3">
-    <!-- <unit bldFile="homemedia/group"/> -->
+     <unit bldFile="homemedia/group"/> 
    </component>
   </collection>
   <collection id="dlnasrv_info" name="DLNA Services Info" level="plugin">
-   <component id="dlnasrv_build" filter="s60" name="DLNA Services Build">
-    <!-- need to #include upnpplatformvar.hrh from each #included bld.inf, then this can be removed  -->
-    <unit bldFile="group"/>
-   </component>
    <component id="dlnasrv_api_test" filter="s60,test,api_test" name="DLNA Services API Tests" purpose="development">
     <unit bldFile="tsrc/group"/>
    </component>
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/mw/drm/package_definition.xml
--- a/symbian4/mw/drm/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/mw/drm/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -88,9 +88,6 @@
    <component id="drmencryptor" filter="s60" name="DRM Encryptor">
     <!-- this should have its own bld.inf or be removed as a component -->
    </component>
-   <component id="drmsettingsplugin" filter="s60" name="DRM Settings Plugin" class="plugin">
-    <!-- this should have its own bld.inf or be removed as a component -->
-   </component>
    <component id="drmrightsmanagerui" filter="s60" name="DRM Rights Manager UI">
     <unit bldFile="commondrm/drmrightsmanagerui/help/group"/>
    </component>
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/mw/gsprofilesrv/package_definition.xml
--- a/symbian4/mw/gsprofilesrv/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/mw/gsprofilesrv/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -19,36 +19,11 @@
     <meta rel="Api" href="gsprofilesrv_plat/profiles_engine_api/profiles_engine_api.metaxml"/>
     <unit bldFile="gsprofilesrv_plat/profiles_engine_api/group"/>
    </component>
-   <component id="settings_backgroundimage_api" name="Settings Background Image API" class="api" filter="s60">
-    <meta rel="Api" href="gsprofilesrv_plat/settings_backgroundimage_api/settings_backgroundimage_api.metaxml"/>
-    <unit bldFile="gsprofilesrv_plat/settings_backgroundimage_api/group"/>
-   </component>
-   <component id="settings_framework_api" name="Settings Framework API" class="api" filter="s60">
-    <meta rel="Api" href="gsprofilesrv_plat/settings_framework_api/settings_framework_api.metaxml"/>
-    <unit bldFile="gsprofilesrv_plat/settings_framework_api/group"/>
-   </component>
-   <component id="settings_launch_api" name="Settings Launch API" class="api" filter="s60">
-    <meta rel="Api" href="gsprofilesrv_plat/settings_launch_api/settings_launch_api.metaxml"/>
-    <unit bldFile="gsprofilesrv_plat/settings_launch_api/group"/>
-   </component>
-   <component id="settings_listbox_api" name="Settings List Box API" class="api" filter="s60">
-    <meta rel="Api" href="gsprofilesrv_plat/settings_listbox_api/settings_listbox_api.metaxml"/>
-    <unit bldFile="gsprofilesrv_plat/settings_listbox_api/group"/>
-   </component>
-   <component id="settings_plugin_api" name="Settings Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="gsprofilesrv_plat/settings_plugin_api/settings_plugin_api.metaxml"/>
-    <unit bldFile="gsprofilesrv_plat/settings_plugin_api/group"/>
-   </component>
    <component id="settings_uis_cenrep_collection_api" name="Settings UIs CenRep Collection API" class="api" filter="s60">
     <meta rel="Api" href="gsprofilesrv_plat/settings_uis_cenrep_collection_api/settings_uis_cenrep_collection_api.metaxml"/>
     <unit bldFile="gsprofilesrv_plat/settings_uis_cenrep_collection_api/group"/>
    </component>
   </collection>
-  <collection id="gssettingsuis" name="General Settings UIs" level="framework">
-   <component id="gs" filter="s60" name="General Settings" introduced="9.2">
-    <unit bldFile="gssettingsuis/gs/group"/>
-   </component>
-  </collection>
   <collection id="ftuwizardmodel" name="FTU Wizard Model" level="generic">
     <component id="ftuwizardmodel_build" name="FTU Wizardmodel Build" filter="bldfirst">
      <unit bldFile="ftuwizardmodel" qt:proFile="ftuwizardmodel.pro" qt:qmakeArgs="-r -config rom"/>
@@ -59,13 +34,23 @@
       <meta rel="testbuild">
        <group name="controlpanel_tests"/>
       </meta>
-      <unit bldFile="controlpanel/tsrc" qt:proFile="tsrc.pro" qt:qmakeArgs="-r"/>
+      <unit bldFile="controlpanel/tsrc" qt:proFile="tsrc.pro" qt:qmakeArgs="-r"/> 
    </component> 
    <component id="controlpanel_rom" name="Control Panel ROM" filter="s60">
-      <unit bldFile="controlpanel/rom" qt:proFile="cp_rom.pri" qt:qmakeArgs="-r -config rom"/>
+      <!-- Need to create a real .pro file for this 
+	  <unit bldFile="controlpanel/rom" qt:proFile="cp_rom.pri" qt:qmakeArgs="-r -config rom"/> -->
+   </component>
+   <component id="controlpanel_config" name="Control Panel Config" filter="s60" class="config" introduced="^4">
+      <!-- Need to create a real .pro file for this 
+	  <unit bldFile="controlpanel/conf" qt:proFile="conf.pri" qt:qmakeArgs="-r -config rom"/> -->
    </component>
    <component id="controlpanel_source" name="Control Panel Source" filter="s60">
-      <unit bldFile="controlpanel/src" qt:qmakeArgs="-r -config rom" qt:proFile="src.pro"/>
+      <!-- Uncomment when controlpanel_build is removed
+	  <unit bldFile="controlpanel/src" qt:qmakeArgs="-r -config rom" qt:proFile="src.pro"/> -->
+   </component>
+   <component id="controlpanel_build" name="Control Panel Build" filter="s60">
+	<!-- need to make included .pri file into a real .pro file -->
+      <unit bldFile="controlpanel" qt:qmakeArgs="-r -config rom" qt:proFile="controlpanel.pro"/>
    </component>
   </collection>
   <collection id="profilesservices" name="Profiles Services" level="server">
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/mw/gstreamer/package_definition.xml
--- a/symbian4/mw/gstreamer/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/mw/gstreamer/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -20,7 +20,7 @@
       </component>
       <component id="gst_plugins_symbian" filter="s60" name="GStreamer Sybmian Plugins" introduced="^3">
         <!--<unit bldFile="gst_plugins_symbian/group" filter="!test"/>-->
-        <!--<unit bldFile="gst_plugins_symbian/tsrc/GStreamerTestModule/group" filter="test,pref_test"/>-->
+        <unit bldFile="gst_plugins_symbian/tsrc/gstreamertestmodule/group" filter="test"/> <!-- add ,pref_test,TA_GSTREAMER filters later -->
       </component>
     </collection>
     <collection id="gstregistrygenerator" name="GStreamer Registry Generator" level="core">
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/mw/hgwidgets/package_definition.xml
--- a/symbian4/mw/hgwidgets/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/mw/hgwidgets/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -1,22 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
-  <package id="hgwidgets" name="HG Widgets" levels="framework service api">
-    <collection id="hgwidgets_plat" name="HG Widgets Platform Interfaces" level="api">
+  <package id="hgwidgets" name="Multimedia Widgets" levels="framework service api">
+    <collection id="hgwidgets_plat" name="Multimedia Widgets Platform Interfaces" level="api">
      <component id="ganeswidgets_api" name="Ganes Widgets API" class="api" introduced="^4">
 		<!-- should separate out unit -->
 	 </component>
+     <component id="hgcacheproxymodel_api" name="Hg Cache Proxy Model API" class="api" introduced="^4">
+		<!-- should separate out unit -->
+	 </component>
+     <component id="hgwidgets_plat_build" name="Multimedia Widgets Platform Interfaces Build" class="api" introduced="^4">
+		<!-- break this up into separate components -->
+      <unit bldFile="hgwidgets_plat" qt:proFile="hgwidgets_plat.pro"/>
+	 </component>
     </collection>
-    <collection id="hgwidgets_pub" name="HG Widgets Public Interfaces" level="api"/>
     <collection id="ganeswidgets" name="Ganes Widgets" level="service">
 		<!-- really a component, should move down a dir level and have a unit -->
       <component id="ganeswidgets_build" name="Ganes Widgets Build" introduced="^4">
-		<!-- should separate out unit -->
+        <unit bldFile="ganeswidgets" qt:proFile="ganeswidgets.pro"/>
 	 </component>
     </collection>	 
-    <collection id="hgwidgets_info" name="HG Widgets Info" level="framework">
-     <component id="hgwidgets_build" name="HG Widgets Build" introduced="^4">
-      <unit bldFile="." qt:proFile="hgwidgets.pro"/>
-     </component>
+    <collection id="hgcacheproxymodel" name="Hurriganes Cache Proxy Model" level="framework">
+		<!-- really a component, should move down a dir level and have a unit -->
+      <component id="hgcacheproxymodel_build" name="Hurriganes Cache Proxy Model Build" introduced="^4">
+        <unit bldFile="hgcacheproxymodel" qt:proFile="hgcacheproxymodel.pro"/>
+	 </component>
     </collection>
   </package>
 </SystemDefinition>
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/mw/homescreensrv/package_definition.xml
--- a/symbian4/mw/homescreensrv/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/mw/homescreensrv/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -1,6 +1,5 @@
 <SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
  <package id="homescreensrv" name="Home Screen Services" levels="plugin framework server generic specific">
-
   <collection id="appfoundation" name="App Foundation" level="generic">
      <component id="appfoundation_build" name="App Foundation Build"  introduced="^4">
       <unit bldFile="appfoundation" qt:qmakeArgs="-r" qt:proFile="appfoundation.pro"/>
@@ -27,27 +26,13 @@
      <component id="caclient" name="Content Arsenal Client"  introduced="^4">
       <unit bldFile="contentstorage/caclient" qt:qmakeArgs="-r" qt:proFile="caclient.pro"/>
      </component>
+     <component id="casoftwareregistry" name="Content Arsenal Software Registry"  introduced="^4">
+      <unit bldFile="contentstorage/casoftwareregistry" qt:qmakeArgs="-r" qt:proFile="casoftwareregistry.pro"/>
+     </component>
   </collection>
-
   <collection id="homescreensrv_plat" name="Home Screen Services Platform Interfaces" level="specific">
      <component id="homescreensrv_plat_build" name="Home Screen Services Platform Interfaces build"  introduced="^4">
       <unit bldFile="homescreensrv_plat" qt:qmakeArgs="-r" qt:proFile="homescreensrv_plat.pro"/>
-     </component>
-   <component id="action_handler_plugin_api" name="Action Handler Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="homescreensrv_plat/action_handler_plugin_api/action_handler_plugin_api.metaxml"/>
-    <unit base="homescreensrv_plat/action_handler_plugin_api"/>
-   </component>
-   <component id="content_harvester_plugin_api" name="Content Harvester Plugin API" class="api" filter="s60">
-    <meta rel="Api" href="homescreensrv_plat/content_harvester_plugin_api/content_harvester_plugin_api.metaxml"/>
-    <unit base="homescreensrv_plat/content_harvester_plugin_api"/>
-   </component>
-   <component id="sapi_contentpublishing" name="SAPI Content Publishing" class="api" filter="s60">
-    <meta rel="Api" href="homescreensrv_plat/sapi_contentpublishing/sapi_contentpublishing.metaxml"/>
-    <unit base="homescreensrv_plat/sapi_contentpublishing"/>
-   </component>
-   <component id="sapi_actionhandler" name="SAPI Action Handler" class="api" filter="s60">
-    <meta rel="Api" href="homescreensrv_plat/sapi_actionhandler/sapi_actionhandler.metaxml"/>
-    <unit base="homescreensrv_plat/sapi_actionhandler"/>
    </component>
    <component id="menu_sat_interface_api" name="Menu SAT Interface API" class="api" filter="s60">
     <meta rel="Api" href="homescreensrv_plat/menu_sat_interface_api/menu_sat_interface_api.metaxml"/>
@@ -69,11 +54,17 @@
     <unit base="homescreensrv_plat/homescreen_information_api"/>
    </component>
   </collection>
-  <collection id="hsactivityfw" name="Activity Framework" level="activityfw">
+  <collection id="hsactivityfw" name="Activity Framework" level="fw">
      <component id="hsactivityfw_build" name="Activity Framework Build"  introduced="^4">
       <unit bldFile="activityfw" qt:qmakeArgs="-r" qt:proFile="activityfw.pro"/>
      </component>
   </collection>
+  <collection id="tstaskmonitor" name="Task Switcher Task Monitor" level="fw">	
+	<!-- move collection down to a component directory or split up into component .pro files -->
+     <component id="tstaskmonitor_build" name="Task Switcher Task Monitor Build"  introduced="^4">
+      <unit bldFile="tstaskmonitor" qt:qmakeArgs="-r" qt:proFile="tstaskmonitor.pro"/>
+     </component>
+  </collection>
   <collection id="hsappkeyhandler" name="HS Appplication Key Handler" level="server">
      <component id="hsappkeyhandler_build" name="Appplication Key Handler Build"  introduced="^4">
       <unit bldFile="hsappkeyhandler" qt:qmakeArgs="-r" qt:proFile="hsappkeyhandler.pro"/>
@@ -81,7 +72,7 @@
   </collection>
     <collection id="homescreensrv_info" name="Home Screen Services Info" level="specific">
      <component id="homescreensrvconf" name="Home Screen Services Config" class="config" introduced="^4">
-      <unit bldFile="." qt:qmakeArgs="-r" qt:proFile="homescreensrv.pro"/>
+      <unit bldFile="." qt:qmakeArgs="-r" qt:proFile="homescreensrv_exports_to_rom.pri"/>
      </component>
      <component id="homescreensrvrom" name="Home Screen Services ROM" introduced="^4">
       <unit bldFile="group"/>
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/mw/homescreensrvlegacy/package_definition.xml
--- a/symbian4/mw/homescreensrvlegacy/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/mw/homescreensrvlegacy/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -10,7 +10,7 @@
     <meta rel="Api" href="ai_plugin_information_api/ai_plugin_information_api.metaxml"/>
     <unit bldFile="ai_plugin_information_api/group" qt:proFile="group.pro"/>
    </component>
-   <component id="content_harvester_plugin_api" name="Content Harvester Plug-in API" class="api" filter="s60">
+   <component id="content_harvester_plugin_api" name="Content Harvester Plugin API " class="api" filter="s60">
     <meta rel="Api" href="content_harvester_plugin_api/content_harvester_plugin_api.metaxml"/>
     <unit bldFile="content_harvester_plugin_api/group"/>
    </component>
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/mw/imsrv/package_definition.xml
--- a/symbian4/mw/imsrv/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/mw/imsrv/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -102,7 +102,7 @@
     <meta rel="Api" href="imsrv_plat/im_cache_server_api/im_cache_server_api.metaxml"/>
     <unit bldFile="imsrv_plat/im_cache_server_api/group"/>
    </component>
-   <component id="presence_avabilitytext" name="Presence Avability Text" class="api" filter="s60">
+   <component id="presence_avabilitytext" name="Presence Availability Text" class="api" filter="s60">
     <unit bldFile="imsrv_plat/presence_avabilitytext/group"/>
    </component>
   </collection>
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/mw/inputmethods/package_definition.xml
--- a/symbian4/mw/inputmethods/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/mw/inputmethods/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -67,8 +67,7 @@
     <meta rel="config">
      <defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
     </meta>
-    <!--uncomment when configuration is turned on and textinput_build is removed-->
-    <!--  <unit bldFile="textinput/ptienginev2/group"/>-->
+	<unit bldFile="textinput/ptienginev2/group"/>
    </component>
    <component id="akninputlanguage" filter="s60" name="Avkon Input Language">
     <unit bldFile="textinput/akninputlanguage/group"/>
@@ -76,19 +75,6 @@
    <component id="peninputarc" filter="s60" name="Pen Input Arc">
     <unit bldFile="textinput/peninputarc/group"/>
    </component>
-   <component id="peninputcommonctrls" filter="s60" name="Pen Input Common Controls">
-    <unit bldFile="textinput/peninputcommonctrls/group"/>
-   </component>
-   <component id="peninputcommonlayout" filter="s60" name="Pen Input Common Layout">
-    <unit bldFile="textinput/peninputcommonlayout/group"/>
-   </component>
-   <component id="peninputhwrtrui" filter="s60" name="Pen Input Handwriting Recognition Training UI" class="plugin" introduced="^3">
-    <unit bldFile="textinput/peninputhwrtrui/group"/>
-   </component>
-   <component id="textinput_build" filter="s60" name="Text Input Build">
-    <!--needed for #ifdef, can be removed when configuration is implemented -->
-    <unit bldFile="textinput/group"/>
-   </component>
   </collection>
   <collection id="fep" name="FEP" level="engine">
    <component id="aknfep" filter="s60" name="Avkon FEP" class="plugin">
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/mw/ipappprotocols/package_definition.xml
--- a/symbian4/mw/ipappprotocols/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/mw/ipappprotocols/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -33,7 +33,7 @@
         <unit bldFile="sipplugins/sippwlanplugin/group"/>
       </component>
       <component id="sippsipsettingsui" filter="s60" name="SIP Settings UI" class="plugin">
-        <unit bldFile="sipplugins/sippsipsettingsui/group"/>
+        <!--<unit bldFile="sipplugins/sippsipsettingsui/group"/> -->
       </component>
       <component id="sippdevmgmtsipadapter" filter="s60" name="Device Management SIP Settings Adapter" class="plugin">
         <unit bldFile="sipplugins/sippdevmgmtsipadapter/group"/>
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/mw/ipconnmgmt/package_definition.xml
--- a/symbian4/mw/ipconnmgmt/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/mw/ipconnmgmt/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -84,11 +84,6 @@
     <unit bldFile="ipcm_pub/extendedconnpref_api/group"/>
    </component>
   </collection>
-  <collection id="accesspointcontrol" name="Access Point Control" level="plugin">
-   <component id="apcontrollistplugin" filter="s60" name="Access Point Control List Plugin" class="plugin" introduced="^2">
-    <unit bldFile="accesspointcontrol/apcontrollistplugin/group"/>
-   </component>
-  </collection>
   <collection id="alwayson_net_plugin" name="Always Online Net Plugin" level="server">
    <component id="pdpcontextmanager2" filter="s60" name="PDP Context Manager 2">
     <unit bldFile="alwayson_net_plugin/pdpcontextmanager2/group"/>
@@ -144,8 +139,7 @@
     <meta rel="config">
      <not-defined condition="WINSCW"/>
     </meta>
-    <!-- uncomment when config is turned on -->
-    <!-- <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>-->
+    <unit bldFile="dbcreator/commsdatcreatorrfsplugin/group"/>
    </component>
    <component id="commsdatstartup" filter="s60" name="Comms Database Startup" introduced="9.3">
     <unit bldFile="dbcreator/commsdatstartup/group"/>
@@ -160,7 +154,7 @@
   </collection>
   <collection id="ipconnmgmt_info" name="IP Connectivity Management Info" level="api">
    <component id="ipcm_build" filter="s60" name="IP Connectivity Management Build">
-    <!-- need to move exports to another component, or maek this a config component and revmove the #includes -->
+    <!-- need to move exports to another component, or make this a config component and revmove the #includes -->
     <unit bldFile="group"/>
    </component>
    <component id="ipcm_qt_build" name="IP Connectivity Management Qt Build" introduced="^4">
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/mw/legacypresence/package_definition.xml
--- a/symbian4/mw/legacypresence/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/mw/legacypresence/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -60,12 +60,6 @@
     <unit bldFile="xdmengine/group"/>
    </component>
   </collection>
-  <collection id="xdmsettingsui" name="XDM Settings UI" level="ui">
-   <!-- collection is really a component. Need to move down a directory (eg xdm/xdmsettingsui)-->
-   <component id="xdmsettingsui_build" filter="s60" name="XDM Settings UI Build">
-    <unit bldFile="xdmsettingsui/group"/>
-   </component>
-  </collection>
   <collection id="xdmprotocols" name="XDM Protocols" level="fw">
    <!-- collection is really a component. Need to move down a directory (eg xdm/xdmprotocols)-->
    <component id="xdmprotocols_build" filter="s60" name="XDM Protocols Build">
@@ -78,12 +72,6 @@
     <unit bldFile="msgconnmanager/group"/>
    </component>
   </collection>
-  <collection id="presencesettingsui" name="Presence Settings UI" level="ui">
-   <!-- collection is really a component. Need to move down a directory-->
-   <component id="presencesettingsui_build" filter="s60" name="Presence Settings UI Build">
-    <unit bldFile="presencesettingsui/group"/>
-   </component>
-  </collection>
   <collection id="simpleengine" name="SIMPLE Engine" level="engine">
    <!-- collection is really a component. Need to move down a directory-->
    <component id="simpleengine_build" filter="s60" name="SIMPLE Engine Build">
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/mw/locationsrv/package_definition.xml
--- a/symbian4/mw/locationsrv/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/mw/locationsrv/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
  <package id="locationsrv" name="Location Services" levels="plugin fw server if">
   <collection id="locsrv_pub" name="Location Services Public Interfaces" level="if">
    <component id="landmarks_search_api" name="Landmarks Search API" class="api" filter="s60">
@@ -28,6 +28,12 @@
     <meta rel="Api" href="locsrv_plat/geocoding_api/geocoding_api.metaxml"/>
     <unit bldFile="locsrv_plat/geocoding_api/group"/>
    </component>
+   <component id="supl_pos_message_plugin_api" name="SUPL POS Message Plugin API" class="api" filter="s60">
+	<!-- placeholder
+    <meta rel="Api" href="locsrv_plat/supl_pos_message_plugin_api/supl_pos_message_plugin_api.metaxml"/>
+    <unit bldFile="locsrv_plat/supl_pos_message_plugin_api/group"/>
+	 -->
+   </component>
    <component id="landmarks_category_definition_api" name="Landmarks Category Definition API" class="api" filter="s60">
     <meta rel="Api" href="locsrv_plat/landmarks_category_definition_api/landmarks_category_definition_api.metaxml"/>
     <unit bldFile="locsrv_plat/landmarks_category_definition_api/group"/>
@@ -92,6 +98,9 @@
    <component id="locationsysui" filter="s60" name="Location System UI">
     <unit bldFile="locationsystemui/locationsysui/group"/>
    </component>
+   <component id="locationsysui" filter="s60" name="Location System Qt UI">
+    <unit bldFile="locationsystemui/locationsysui" qt:proFile="locsysui.pro"/>
+   </component>
   </collection>
   <collection id="supl" name="SUPL" level="fw">
    <component id="locationsuplfw" filter="s60" name="Location SUPL Framework">
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/mw/mds/package_definition.xml
--- a/symbian4/mw/mds/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/mw/mds/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -135,8 +135,7 @@
     <defined condition="RD_MDS_2_5"/>
    </meta>
    <component id="clfwrapper_build" filter="s60" name="CLF Wrapper Build" introduced="^2">
-    <!-- Uncomment unit when configuration is in place. Currently #included from mds_build -->
-    <!--<unit bldFile="clfwrapper/group"/>-->
+    <unit bldFile="clfwrapper/group"/>
    </component>
   </collection>
   <collection id="mds_info" name="Metadata Services Info" level="int">
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/mw/mmappfw/package_definition.xml
--- a/symbian4/mw/mmappfw/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/mw/mmappfw/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -90,6 +90,9 @@
    <component id="videoplaylist_utility_api" name="Video Playlist Utility API" introduced="^1" class="api" filter="s60">
     <unit bldFile="mmappfw_plat/videoplaylist_utility_api/group"/>
    </component>
+   <component id="qt_telephony_multimedia_service_api" name="Qt Telephony Multimedia Service API" introduced="^4" class="api" filter="s60">
+    <unit bldFile="mmappfw_plat/qt_telephony_multimedia_service_api/group"/>
+   </component>
   </collection>
   <collection id="mpx" name="Multimedia Player" level="fw">
    <component id="commonframework" filter="s60" name="MPX Common Framework" introduced="^1">
@@ -104,7 +107,7 @@
    <component id="mpxviewfw" filter="s60" name="MPX View Framework" introduced="^1">
     <unit bldFile="mpx/viewframework/group"/>
    </component>
-   <component id="mpxviewframeworkqt" name="MPX View Framework Qt" filter="s60" introducde="^4">
+   <component id="mpxviewframeworkqt" name="MPX View Framework Qt" filter="s60" introduced="^4">
       <unit bldFile="mpx/mpxviewframeworkqt" qt:proFile="mpxviewframeworkqt.pro" qt:qmakeArgs="-r -config rom"/>
    </component>
    <component id="mpx_build" filter="s60" name="MPX Build" introduced="^1">
@@ -137,15 +140,13 @@
     <meta rel="config">
      <defined condition="IAD_INCLUDE_AUDIOFETCHER"/>
     </meta>
-    <!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-    <!-- <unit bldFile="mmappcomponents/audiofetcher/group"/>-->
+    <unit bldFile="mmappcomponents/audiofetcher/group"/>
    </component>
    <component id="asxparser" filter="s60" name="ASX Parser" introduced="^1">
     <meta rel="config">
      <defined condition="__WINDOWS_MEDIA"/>
     </meta>
-    <!-- uncomment when config is in place, currently #included in mmappcomponents_build -->
-    <!-- <unit bldFile="mmappcomponents/asxparser/group"/>-->
+    <unit bldFile="mmappcomponents/asxparser/group"/>
    </component>
    <component id="playbackhelper" filter="s60" name="Playback Helper" introduced="^3">
     <unit bldFile="mmappcomponents/playbackhelper/group"/>
@@ -157,6 +158,12 @@
     <unit bldFile="mmappcomponents/mmmtpdataprovider/group"/>
    </component>
   </collection>
+  <collection id="qtms" name="Qt Telephony Multimedia Services" level="fw">
+   <component id="qtms_build" filter="s60" name="Qt Telephony Multimedia Services Build" introduced="^4">
+    <!--  Collection is really a component. Move down a dir -->
+    <unit bldFile="qtms" qt:proFile="qtmsapi.pro" qt:qmakeArgs="-r -config rom"/>
+   </component>
+  </collection>
   <collection id="mmappfw_info" name="Multimedia App Framework Info" level="if">
    <component id="mmappfw_build" filter="s60" name="Multimedia App Framework Build" introduced="^1">
     <!--  Move the export to another component or remove the #includes from this one -->
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/mw/mmmw/package_definition.xml
--- a/symbian4/mw/mmmw/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/mw/mmmw/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -1,19 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
+<SystemDefinition schema="3.0.1">
  <package id="mmmw" name="Multimedia Middleware" levels="plugin framework server generic specific">
   <collection id="mmmw_plat" name="Multimedia Middleware Platform Interfaces" level="specific">
    <component id="multimedia_data_source_api" name="Multimedia Data Source API" class="api" filter="s60">
     <meta rel="Api" href="mmmw_plat/multimedia_data_source_api/multimedia_data_source_api.metaxml"/>
     <unit bldFile="mmmw_plat/multimedia_data_source_api/group"/>
    </component>
-   <component id="progressive_download_api" name="Progressive Download API" class="api" filter="s60">
-    <meta rel="Api" href="mmmw_plat/progressive_download_api/progressive_download_api.metaxml"/>
-    <unit bldFile="mmmw_plat/progressive_download_api/group"/>
-   </component>
-   <component id="equalizer_ui_api" name="Equalizer UI API" class="api" filter="s60">
-    <meta rel="Api" href="mmmw_plat/equalizer_ui_api/equalizer_ui_api.metaxml"/>
-    <unit bldFile="mmmw_plat/equalizer_ui_api/group"/>
-   </component>
    <component id="enhanced_media_client_api" name="Enhanced Media Client API" class="api" filter="s60">
     <meta rel="Api" href="mmmw_plat/enhanced_media_client_api/enhanced_media_client_api.metaxml"/>
     <unit bldFile="mmmw_plat/enhanced_media_client_api/group"/>
@@ -34,10 +26,6 @@
     <meta rel="Api" href="mmmw_plat/audio_metadata_reader_api/audio_metadata_reader_api.metaxml"/>
     <unit bldFile="mmmw_plat/audio_metadata_reader_api/group"/>
    </component>
-   <component id="emc_progressive_download_source_api" name="EMC Progressive Download Source API" class="api" filter="s60">
-    <meta rel="Api" href="mmmw_plat/emc_progressive_download_source_api/emc_progressive_download_source_api.metaxml"/>
-    <unit bldFile="mmmw_plat/emc_progressive_download_source_api/group"/>
-   </component>
    <component id="emc_volume_effect_api" name="EMC Volume Effect API" class="api" filter="s60">
     <meta rel="Api" href="mmmw_plat/emc_volume_effect_api/emc_volume_effect_api.metaxml"/>
     <unit bldFile="mmmw_plat/emc_volume_effect_api/group"/>
@@ -101,10 +89,19 @@
       <meta rel="Api" href="mmmw_plat/openmax_al_api/openmax_al_api.metaxml"/>
       <unit bldFile="mmmw_plat/openmax_al_api/group"/>
    </component>
+   <component id="openmax_al_ext_api" name="OpenMAX AL Extensions API" class="api" filter="s60" introduced="^4">
+      <meta rel="Api" href="mmmw_plat/openmax_al_ext_api/openmax_al_ext_api.metaxml"/>
+      <unit bldFile="mmmw_plat/openmax_al_ext_api/group"/>
+   </component>
    <component id="system_tone_service_api" name="System Tone Service API" class="api" filter="s60" introduced="^4">
       <unit bldFile="mmmw_plat/system_tone_service_api/group"/>
    </component>
   </collection>
+  <collection id="khronosfws" name="Khronos Frameworks" level="framework">
+      <component id="openmax_al" filter="s60" name="OpenMAX AL" introduced="^4">
+        <unit bldFile="khronosfws/openmax_al/group"/>
+      </component>
+  </collection>
   <collection id="mmfenh" name="MMF Enhancements" level="generic">
    <component id="advancedaudiocontroller" filter="s60" name="Advanced Audio Controllers" class="plugin">
     <unit bldFile="mmfenh/advancedaudiocontroller/group"/>
@@ -124,21 +121,11 @@
    <component id="profilesettingsmonitor" filter="s60" name="Profile Settings Monitor">
     <unit bldFile="mmfenh/profilesettingsmonitor/group"/>
    </component>
-   <component id="progressivedownload" filter="s60" name="Progressive Download">
-    <unit bldFile="mmfenh/progressivedownload/group"/>
-   </component>
    <component id="mmfenh_test" filter="s60,test,module_test,pref_test" name="MMF Enhancements Tests" purpose="development">
     <unit bldFile="mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/group"/>
    </component>
   </collection>
-  <collection id="mm_fw" name="Multimedia Frameworks" level="framework">
-   <!-- Id needs to be unique, mmfw already in use -->
-   <!-- Placeholder for OpenAX AL and other stuff -->
-  </collection>
   <collection id="mmserv" name="Multimedia Services" level="specific">
-   <component id="audioeffectsui" filter="s60" name="Audio Effects UI">
-    <unit bldFile="mmserv/audioeffectsui/group"/>
-   </component>
    <component id="callaudiocontrol" filter="s60" name="Call Audio Control">
     <unit bldFile="mmserv/callaudiocontrol/group"/>
    </component>
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/mw/platformtools/package_definition.xml
--- a/symbian4/mw/platformtools/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/mw/platformtools/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -3,7 +3,7 @@
   <package id="platformtools" name="Platform Tools">
     <collection id="gfxconversion" name="Graphics Conversion">
       <component id="bmconv_s60" filter="s60" name="S60 Bitmap Converter" target="desktop">
-        <unit bldFile="gfxconversion/bmconv_s60/group"/>
+	   <!-- Removed bmconv from builds     <unit bldFile="gfxconversion/bmconv_s60/group"/>   -->
       </component>
       <component id="mifconv" filter="s60" name="Multi Icon File Converter" target="desktop">
         <unit bldFile="gfxconversion/mifconv/group"/>
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/mw/qt/package_definition.xml
--- a/symbian4/mw/qt/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/mw/qt/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -10,25 +10,25 @@
     </collection>
     <collection id="qt_info" name="Qt Info" level="mw">
             <component id="qt_build" name="Qt Build" introduced="^2">
-  		        <unit bldFile="." qt:proFile="projects.pro" qt:qmakeArgs="-r -config sgimagelite_support"/>
+  		        <unit bldFile="." qt:proFile="projects.pro" qt:qmakeArgs="&quot;QMAKE_MOC=/epoc32/tools/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/uic.exe&quot; -r"/>
             </component>
     </collection>
     <collection id="qtdemos" name="Qt Demos" level="app">
-            <component id="qtdemos_build" name="Qt Demos Build" introduced="^2" filter="qtdemos">
-                <unit bldFile="demos" qt:proFile="demos.pro" qt:qmakeArgs="-r"/>
+            <component id="qtdemos_build" name="Qt Demos Build" introduced="^2" filter="test,qtdemos">
+                <unit bldFile="demos" qt:proFile="demos.pro" qt:qmakeArgs="&quot;QMAKE_MOC=/epoc32/tools/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/uic.exe&quot; -r"/>
             </component>
     </collection>
     <collection id="qtexamples" name="Qt Examples" level="app">
-            <component id="qtexamples_build" name="Qt Examples Build" introduced="^2"  filter="qtexamples">
-                <unit bldFile="examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
+            <component id="qtexamples_build" name="Qt Examples Build" introduced="^2"  filter="test,qtexamples">
+                <unit bldFile="examples" qt:proFile="examples.pro" qt:qmakeArgs="&quot;QMAKE_MOC=/epoc32/tools/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/uic.exe&quot; -r"/>
             </component>
     </collection>
     <collection id="qt_tests" name="Qt Tests" level="app">
             <component id="qttestsauto" name="Qt Automated Tests" introduced="^2"  filter="qttestsauto,test">
-                <unit bldFile="tests/auto"  qt:proFile="qtpauto.pro" qt:makeArgs="-r"/>
+                <unit bldFile="tests/auto"  qt:proFile="qtpauto.pro" qt:makeArgs="&quot;QMAKE_MOC=/epoc32/tools/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/uic.exe&quot; -r"/>
             </component>
             <component id="qttestsbenchmarks" name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks,test">
-                <unit bldFile="tests/benchmarks" qt:proFile="benchmarks.pro" qt:qmakeArgs="-r"/>
+                <unit bldFile="tests/benchmarks" qt:proFile="benchmarks.pro" qt:qmakeArgs="&quot;QMAKE_MOC=/epoc32/tools/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/uic.exe&quot; -r"/>
             </component>
     </collection>
   </package>
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/mw/qtextensions/package_definition.xml
--- a/symbian4/mw/qtextensions/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/mw/qtextensions/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -47,7 +47,7 @@
      </component>
     </collection>
     <collection id="qtextensions_info" name="Qt Extensions Info" level="app">
-    <component id="qtextensions_conf" name="Qt Extensions Confgure" class="conf" introduced="^4" filter="qt_tools">
+    <component id="qtextensions_conf" name="Qt Extensions Confgure" class="config" introduced="^4" filter="qt_tools">
       <unit bldFile="group"/>
      </component>
      <component id="qtextensions_build" name="Qt Extensions Build" introduced="^4">
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/mw/remotemgmt/package_definition.xml
--- a/symbian4/mw/remotemgmt/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/mw/remotemgmt/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -100,26 +100,6 @@
     <meta rel="Api" href="remotemgmt_plat/pnpms_utils_api/pnpms_utils_api.metaxml"/>
     <unit bldFile="remotemgmt_plat/pnpms_utils_api/group"/>
    </component>
-   <component id="diagnostics_plugin_utility_api" name="Diagnostics Plugin Utility API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/diagnostics_plugin_utility_api/diagnostics_plugin_utility_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/diagnostics_plugin_utility_api/group"/>
-   </component>
-   <component id="diagnostics_plugin_api" name="Diagnostics Plug-in API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/diagnostics_plugin_api/diagnostics_plugin_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/diagnostics_plugin_api/group"/>
-   </component>
-   <component id="diagnostics_framework_api" name="Diagnostics Framework API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/diagnostics_framework_api/diagnostics_framework_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/diagnostics_framework_api/group"/>
-   </component>
-   <component id="diagnostics_results_api" name="Diagnostics Results API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/diagnostics_results_api/diagnostics_results_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/diagnostics_results_api/group"/>
-   </component>
-   <component id="diagnostics_plugin_pool_api" name="Diagnostics Plugin Pool API" class="api" filter="s60">
-    <meta rel="Api" href="remotemgmt_plat/diagnostics_plugin_pool_api/diagnostics_plugin_pool_api.metaxml"/>
-    <unit bldFile="remotemgmt_plat/diagnostics_plugin_pool_api/group"/>
-   </component>
    <component id="adaptive_history_list_api" name="Adaptive History List API" class="api" filter="s60">
     <meta rel="Api" href="remotemgmt_plat/adaptive_history_list_api/adaptive_history_list_api.metaxml"/>
     <unit bldFile="remotemgmt_plat/adaptive_history_list_api/group"/>
@@ -210,23 +190,6 @@
     <unit bldFile="omaprovisioning/provisioning/group"/>
    </component>
   </collection>
-  <collection id="devicediagnosticsfw" name="Device Diagnostics Framework" level="framework">
-   <component id="diagframework" filter="s60" name="Diagnostics Framework">
-    <unit bldFile="devicediagnosticsfw/diagframework/group"/>
-   </component>
-   <component id="diagpluginbase" filter="s60" name="Diagnostics Plugin Base">
-    <unit bldFile="devicediagnosticsfw/diagpluginbase/group"/>
-   </component>
-   <component id="diagresultsdb" filter="s60" name="Diagnostics Results Database">
-    <!--  can only have one unit, merge or split into two components -->
-    <unit bldFile="devicediagnosticsfw/diagresultsdb/client/group"/>
-    <unit bldFile="devicediagnosticsfw/diagresultsdb/server/group"/>
-   </component>
-   <component id="devicediagnosticsfw_build" filter="s60" name="Device Diagnostics Framework Build">
-    <!--  need to distribute exports, etc into the other components and remove this-->
-    <unit bldFile="devicediagnosticsfw/group"/>
-   </component>
-  </collection>
   <collection id="dcmofw" name="Device Capability Management Object Framework" level="framework">
    <component id="dcmoclient" filter="s60" name="DCMO Client">
     <unit bldFile="dcmofw/dcmoclient/group"/>
@@ -243,20 +206,25 @@
    </component>
   </collection>
   <collection id="fotaapplication" name="FOTA Application" level="generic">
-   <component id="fotaapplication_build" filter="s60" name="FOTA Application Build">
-    <!-- remove this component when configuration is in place and the #ifdefs have been worked out -->
-    <unit bldFile="fotaapplication/group"/>
-   </component>
    <component id="fotaserver" filter="s60" name="FOTA Server">
     <meta rel="config">
      <defined condition="__SYNCML_DM_FOTA"/>
     </meta>
-    <!-- uncomment when #ifdefs are resolved -->
-    <!--<unit bldFile="fotaapplication/fotaserver/group"/>-->
+    <unit bldFile="fotaapplication/fotaserver/group"/>
    </component>
    <component id="fotacustcmds" filter="s60" name="FOTA Custom Commands">
-    <!-- uncomment when #ifdefs are resolved. Need to put a config meta here-->
-    <!--<unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>-->
+    <meta rel="config">
+     <defined condition="__SYNCML_DM"/>
+     <not-defined condition="__PLUG_AND_PLAY_MOBILE_SERVICES"/>
+    </meta>
+    <unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>
+   </component>
+   <!-- really need to find a better way to do this -->
+   <component id="fotacustcmds-alt" filter="s60" name="FOTA Custom Commands">
+    <meta rel="config">
+     <defined condition="__PLUG_AND_PLAY_MOBILE_SERVICES"/>
+    </meta>
+    <unit bldFile="fotaapplication/fotaserver/fotacustcmds/group"/>
    </component>
   </collection>
  </package>
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/mw/securitysrv/package_definition.xml
--- a/symbian4/mw/securitysrv/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/mw/securitysrv/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -83,18 +83,12 @@
    <component id="pkcs12" filter="s60" name="PKCS #12">
     <unit bldFile="pkiutilities/pkcs12/group"/>
    </component>
-   <component id="certmanui" filter="s60" name="Certificate Management UI">
-    <unit bldFile="pkiutilities/certmanui/group"/>
-   </component>
    <component id="ctsecuritydialogs" filter="s60" name="Crypto Token Security Dialogs">
     <unit bldFile="pkiutilities/ctsecuritydialogs/group"/>
    </component>
    <component id="certsaver" filter="s60" name="Certificate Saver">
     <unit bldFile="pkiutilities/certsaver/group"/>
    </component>
-   <component id="secmodui" filter="s60" name="Security Module UI">
-    <unit bldFile="pkiutilities/secmodui/group"/>
-   </component>
    <component id="devicetoken" filter="s60" name="Device Token">
     <unit bldFile="pkiutilities/devicetoken/group"/>
    </component>
@@ -134,7 +128,8 @@
    <component id="securitynotifier" filter="s60" name="Security Notifier">
     <unit bldFile="securitydialogs/securitynotifier/group"/>
    </component>
-   <component id="lockclient" filter="s60" name="Lock Client" introduced="^4">
+   <component id="lockclient" filter="s60" name="Lock Client" introduced="^3">
+	<!-- This overwrites the bld.inf already in this dir. I'm pretty sure this will cause problems with the export -->
     <unit bldFile="securitydialogs/lockclient/group" qt:proFile="lockclient.pro" qt:qmakeArgs="-r"/>
    </component>
    <component id="lockapp" filter="s60" name="Lock Application" introduced="^3">
@@ -143,6 +138,29 @@
    <component id="secuinotifications" name="Security UI Notifications" introduced="^4" filter="s60">
       <unit bldFile="securitydialogs/secuinotifications" qt:proFile="secuinotifications.pro" qt:qmakeArgs="-r"/>
    </component>
+   <component id="indicatorautolockplugin" name="Auto Lock Indicator Plugin" introduced="^4" filter="s60" class="plugin">
+		<!-- directory at the wrong level to be a component-->
+      <unit bldFile="securitydialogs/AutolockSrv/indicatorplugin" qt:proFile="indicatorautolockplugin.pro" qt:qmakeArgs="-r"/>
+   </component>
+   <component id="autolockuseractivityservice" name="Auto Lock User Activity Service" introduced="^4" filter="s60">
+		<!-- Can't have two .pro files in the same dir: their generated bld.infs will overwrite each other-->
+      <unit bldFile="securitydialogs/AutolockSrv" qt:proFile="autolockuseractivityservice.pro" qt:qmakeArgs="-r"/>
+   </component>
+   <component id="autolocksrv" name="Auto Lock Server" introduced="^4" filter="s60">
+		<!-- directory at the wrong level to be a component-->
+      <unit bldFile="securitydialogs/AutolockSrv" qt:proFile="AutolockSrv.pro" qt:qmakeArgs="-r"/>
+   </component>
+  </collection>
+  <collection id="cpsecplugins" name="Security Settings Plugins" level="plugin">
+   <component id="devicelockplugin" name="Device Lock Plugin" introduced="^4" filter="s60">
+      <unit bldFile="cpsecplugins/devicelockplugin" qt:proFile="devicelockplugin.pro" qt:qmakeArgs="-r"/>
+   </component>
+   <component id="simpincodeplugin" name="SIM PIN Code Plugin" introduced="^4" filter="s60">
+      <unit bldFile="cpsecplugins/simpincodeplugin" qt:proFile="pincodeplugin.pro" qt:qmakeArgs="-r"/>
+   </component>
+   <component id="cpadvancedsecplugin" name="Advanced Security Plugin" introduced="^4" filter="s60">
+      <unit bldFile="cpsecplugins/cpadvancedsecplugin/group" qt:proFile="advancedsecplugin.pro" qt:qmakeArgs="-r"/>
+   </component>
   </collection>
   <collection id="boottimeintegritycheck" name="Boot Time Integrity Check" level="plugin">
    <!-- collection is really a component. Need to move down a directory-->
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/mw/serviceapi/package_definition.xml
--- a/symbian4/mw/serviceapi/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/mw/serviceapi/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -3,8 +3,9 @@
   <package id="serviceapi" name="Service API" levels="os mw1 mw2 app">
   	<!-- should break up this collection into something meaningful -->
     <collection id="serviceproviders" name="Service Providers" level="mw1">
+		<!-- are commented out components to be removed? -->
       <component id="sapi_contacts_vpbk" name="Contacts Phonebook SAPI"  filter="s60" class="plugin">
-        <unit bldFile="serviceproviders/sapi_contacts_vpbk/group"/>
+        <!--<unit bldFile="serviceproviders/sapi_contacts_vpbk/group"/>-->
       </component>
       <component id="sapi_location" name="Location SAPI"  filter="s60" class="plugin">
         <unit bldFile="serviceproviders/sapi_location/group"/>
@@ -16,14 +17,13 @@
         <unit bldFile="serviceproviders/sapi_landmarks/group"/>
       </component>
       <component id="sapi_messaging" name="Messaging SAPI" filter="s60" class="plugin">
-        <unit bldFile="serviceproviders/sapi_messaging/group"/>
+        <!-- <unit bldFile="serviceproviders/sapi_messaging/group"/> -->
       </component>
-
       <component id="sapi_applicationmanager" name="Application Manager SAPI" filter="s60" class="plugin">
-        <unit bldFile="serviceproviders/sapi_applicationmanager/group"/>
+       <!--  <unit bldFile="serviceproviders/sapi_applicationmanager/group"/>-->
       </component>
       <component id="sapi_calendar" name="Calendar SAPI" filter="s60" class="plugin">
-        <unit bldFile="serviceproviders/sapi_calendar/group"/>
+        <!-- <unit bldFile="serviceproviders/sapi_calendar/group"/> -->
       </component>
       <component id="sapi_logging" name="Logging SAPI"  filter="s60" class="plugin">
         <unit bldFile="serviceproviders/sapi_logging/group"/>
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/mw/shortlinkconn/package_definition.xml
--- a/symbian4/mw/shortlinkconn/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/mw/shortlinkconn/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
  <package id="shortlinkconn" name="Shortlink Connectivity" levels="framework server generic specific plugin">
   <!-- Package is pending removal. Contents to be moved to remoteconn and btservices -->
   <collection id="shortlinkconn_plat" name="Shortlink Connectivity Platform Interfaces" level="plugin">
@@ -43,6 +43,10 @@
    <component id="obexsendservices" name="OBEX Send Services">
     <unit bldFile="localconnectivityservice/obexsendservices/group"/>
    </component>
+   <component id="obexhighway" name="OBEX Highway" introduced="^4">
+	<!-- component must be moved to its own directory. Components cannot live in others component's directories -->
+    <unit bldFile="localconnectivityservice/obexsendservices/obexhighway" qt:proFile="obexhighway.pro"/>
+   </component>
    <component id="obexreceiveservices" name="OBEX Receive Services">
     <unit bldFile="localconnectivityservice/obexreceiveservices/group"/>
    </component>
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/mw/usbservices/package_definition.xml
--- a/symbian4/mw/usbservices/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/mw/usbservices/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -87,10 +87,8 @@
     <unit bldFile="usbclasses/usbphoneasmodem/group"/>
    </component>
   </collection>
+
   <collection id="usbuis" name="USB UIs" level="specific">
-   <component id="usbui" filter="s60" name="USB UI">
-    <unit bldFile="usbuis/usbui/group"/>
-   </component>
    <component id="usbuinotif" filter="s60" name="USB UI Notifiers">
     <unit bldFile="usbuis/usbuinotif/group"/>
    </component>
@@ -100,8 +98,11 @@
    <component id="usbimageprintui" filter="s60" name="ImagePrint UI">
     <unit bldFile="usbuis/imageprintui/group"/>
    </component>
-   <component id="usbuiqt" name="USB UI Qt" introduced="^4" filter="s60">
-      <unit bldFile="usbuis/usbuiqt" qt:proFile="usbapplication.pro"/>
+   <component id="usbsettingsapp" name="USB Settings Application" introduced="^4" filter="s60">
+      <unit bldFile="usbuis/usbsettingsapp" qt:proFile="usbsettingsapp.pro" qt:qmakeArgs="-r"/>
+    </component>
+   <component id="usbindicatorplugin" name="USB Indicator Plugin" introduced="^4" filter="s60" class="plugin">
+      <unit bldFile="usbuis/usbindicatorplugin" qt:proFile="usbindicatorplugin.pro" qt:qmakeArgs="-r"/>
     </component>
   </collection>
   <collection id="usbservices_test" name="USB Services Test" level="server">
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/mw/vpnclient/package_definition.xml
--- a/symbian4/mw/vpnclient/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/mw/vpnclient/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
  <package id="vpnclient" name="VPN Client" levels="engine ui api">
-  <!-- is the !oem_build filter needed? -->
   <collection id="vpnc_plat" name="VPN Client Platform Interfaces" level="api">
       <component id="vpnapi" filter="s60" class="api" name="VPN API">
 		<meta rel="Api" href="vpnc_plat/vpnapi/vpn_api.metaxml"/>
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/mw/web/package_definition.xml
--- a/symbian4/mw/web/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/mw/web/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -100,12 +100,6 @@
     <unit bldFile="web_plat/xml_parser_api/group"/>
    </component>
   </collection>
-  <collection id="web_info" name="Web Info" level="specific">
-   <component id="web_build" filter="s60" name="Web Build">
-    <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-    <unit bldFile="group"/>
-   </component>
-  </collection>
   <collection id="browserutilities" name="Browser Utilities" level="utils">
    <component id="browserdialogsprovider" filter="s60" name="Browser Dialogs Provider">
     <unit bldFile="browserutilities/browserdialogsprovider/group"/>
@@ -138,8 +132,7 @@
     <meta rel="config">
      <defined condition="BRDO_MULTIPART_PARSER_FF"/>
     </meta>
-    <!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
-    <!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
+    <unit bldFile="browserutilities/multipartparser/group"/>
    </component>
    <component id="schemehandler" filter="s60" name="Scheme Handler">
     <unit bldFile="browserutilities/schemehandler/group"/>
@@ -150,10 +143,6 @@
    <component id="aiwbrowserprovider" filter="s60" name="AIW Browser Provider" class="plugin">
     <unit bldFile="browserutilities/aiwbrowserprovider/group"/>
    </component>
-   <component id="browserutilities_build" filter="s60" name="Browser Utilities Build">
-    <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-    <unit bldFile="browserutilities/group"/>
-   </component>
   </collection>
   <collection id="webengine" name="Web Engine" level="server">
    <component id="osswebengine" filter="s60" name="OSS Web Engine">
@@ -237,36 +226,30 @@
    <meta rel="config">
     <defined condition="RD_BROWSER_WIDGETS"/>
     <defined condition="__WEB_WIDGETS"/>
-   </meta>
-   <!-- the following units can be uncommented when configuration is put in place -->
+    </meta>
    <component id="widgetrecognizer" filter="s60" name="Widget Recognizer" class="plugin">
-    <!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
+    <unit bldFile="widgets/widgetrecognizer/group"/>
    </component>
    <component id="widgetinstaller" filter="s60" name="Widget Installer UI" class="plugin">
-    <!--<unit bldFile="widgets/widgetinstaller/group"/>-->
+    <unit bldFile="widgets/widgetinstaller/group"/>
    </component>
    <component id="widgetlauncher" filter="s60" name="Widget Launcher">
-    <!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
+    <unit bldFile="widgets/widgetlauncher/group"/>
    </component>
    <component id="widgetapp" filter="s60" name="Widget UI">
-    <!--<unit bldFile="widgets/widgetapp/group"/>-->
+    <unit bldFile="widgets/widgetapp/group"/>
    </component>
    <component id="widgetpreinstaller" filter="s60" name="Widget Pre-Installer">
     <meta rel="config">
      <defined condition="RD_WIDGET_PREINSTALLER"/>
     </meta>
-    <!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
+    <unit bldFile="widgets/widgetpreinstaller/group"/>
    </component>
    <component id="widgetstartup" filter="s60" name="Widget Startup">
     <meta rel="config">
      <defined condition="RD_WIDGET_PREINSTALLER"/>
     </meta>
-    <!--<unit bldFile="widgets/widgetstartup/group"/>-->
-   </component>
-   <component id="widgets_build" filter="s60" name="Widgets Build">
-    <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed 
-      		#included .hrh file needs to be #included in each of the other components -->
-    <unit bldFile="widgets/group"/>
+    <unit bldFile="widgets/widgetstartup/group"/>
    </component>
   </collection>
  </package>
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/mw/webruntime/package_definition.xml
--- a/symbian4/mw/webruntime/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/mw/webruntime/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
  <package id="webruntime" name="Web Runtime">
-	<!-- need to break up this package nito collections and components -->
+	<!-- need to break up this package into collections and components -->
     <collection id="webruntime_info" name="Web Runtime Info">
      <component id="webruntime_build" name="Web Runtime Build" introduced="^4">
-      <unit bldFile="." qt:proFile="cwrt.pro" qt:qmakeArgs="&quot;what+=ninetwo&quot; &quot;what+=tenone&quot; &quot;what+=qt_unstable&quot; &quot;what+=wrtlite&quot; &quot;what+=exportiby&quot;"/>
+      <unit bldFile="." qt:proFile="cwrt.pro" qt:qmakeArgs="&quot;what+=qtsfw&quot; &quot;what+=qt_unstable&quot; &quot;what+=tenone&quot; &quot;what+=usif&quot; &quot;what+=services&quot; &quot;what+=wrtlite&quot; &quot;what+=exportiby&quot;"/>
      </component>
     </collection>
    </package>
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml
--- a/symbian4/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -5,7 +5,7 @@
   schema CDATA #REQUIRED
   id-namespace CDATA "http://www.symbian.org/system-definition"
 >
-<!-- this DTD describes schema="3.0.0" --> 
+<!-- this DTD describes schema="3.0.1" --> 
 
 <!-- all relative paths are relative to this file
 	all absolute paths are relative to the environment variable specified by the root attribute, or SRCROOT if not.  -->
@@ -38,6 +38,7 @@
   levels NMTOKENS #IMPLIED
   span CDATA #IMPLIED
   before NMTOKEN #IMPLIED
+  replace NMTOKEN #IMPLIED
 >
 
 <!ELEMENT package (meta*,  (package | collection)*)>
@@ -52,6 +53,7 @@
   span CDATA #IMPLIED
   level NMTOKEN #IMPLIED
   before NMTOKEN #IMPLIED  
+  replace NMTOKEN #IMPLIED
 >
 
 <!ELEMENT collection (meta*, (component* ))>
@@ -61,6 +63,7 @@
   href		CDATA #IMPLIED
   level NMTOKEN #IMPLIED
   before NMTOKEN #IMPLIED  
+  replace NMTOKEN #IMPLIED
 >
 
 <!ELEMENT component (meta*, unit*)>
@@ -76,10 +79,10 @@
   class NMTOKENS #IMPLIED
   filter CDATA #IMPLIED
   before NMTOKEN #IMPLIED  
+  replace NMTOKEN #IMPLIED
   origin-model CDATA #IMPLIED
 >
 <!--
-	"filter" attribute is deprecated
 	"origin-model" attribute is only to be inserted by tools when merging models
  	recommended class values are: doc, config, plugin, tool, api -->
 
@@ -95,10 +98,10 @@
   filter CDATA #IMPLIED
   priority CDATA #IMPLIED
 >
-<!-- filter and priority are deprecated 
+<!-- priority is deprecated 
 	"root" attribute will usually be inserted by tools when merging models, although it can be set manually-->
 ]>
-<SystemDefinition schema="3.0.0">
+<SystemDefinition schema="3.0.1">
   <systemModel name="Symbian^4">
     <layer id="adaptation" name="Adaptation" levels="low mw high">
       <package id="stubs" tech-domain="hb" level="high" span="2"  href="../../../../adaptation/stubs/package_definition.xml"/>
@@ -201,14 +204,14 @@
       <package id="messaging" level="apps" span="2" tech-domain="pr" href="../../../../app/messaging/package_definition.xml"/>
       <package id="commonemail" level="apps" span="2" tech-domain="pr" href="../../../../app/commonemail/package_definition.xml"/>
       <package id="camera" level="apps" tech-domain="ma" href="../../../../app/camera/package_definition.xml"/>
-      <!-- <package id="imgeditor" level="apps" tech-domain="ma" href="../../../../app/imgeditor/package_definition.xml"/> -->
-      <!-- <package id="videoeditor" level="apps" tech-domain="ma" href="../../../../app/videoeditor/package_definition.xml"/> -->
+      <package id="imgeditor" level="apps" tech-domain="ma" name="Image Editor"/>
+      <package id="videoeditor" level="apps" tech-domain="ma" name="Video Editor"/>
       <package id="videoplayer" level="apps" tech-domain="ma" href="../../../../app/videoplayer/package_definition.xml"/>
       <package id="photos" level="apps" tech-domain="ma" href="../../../../app/photos/package_definition.xml"/>
       <package id="musicplayer" level="apps" tech-domain="ma" href="../../../../app/musicplayer/package_definition.xml"/>
       <package id="radio" level="apps" tech-domain="ma" href="../../../../app/radio/package_definition.xml"/>
       <package id="internetradio" level="apps" tech-domain="ma" href="../../../../app/internetradio/package_definition.xml"/>
-      <package id="podcatcher" level="apps" tech-domain="ma" href="../../../../app/podcatcher/package_definition.xml"/>
+	  <package id="podcatcher" level="apps" tech-domain="ma" href="../../../../app/podcatcher/package_definition.xml"/>
       <package id="homescreen" level="apps" tech-domain="ui" href="../../../../app/homescreen/package_definition.xml"/>
       <package id="jrt" level="services" tech-domain="rt" href="../../../../app/jrt/package_definition.xml"/>
       <package id="browserui" level="services" tech-domain="rt" href="../../../../app/browserui/package_definition.xml"/>
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/os/deviceplatformrelease/package_definition.xml
--- a/symbian4/os/deviceplatformrelease/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/os/deviceplatformrelease/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -4,15 +4,15 @@
     <collection id="s60extras" name="S60 Extras" level="mid">
     	<!-- collection is really a component. Need to move down a directory -->
       <component id="s60extras_build" filter="s60" name="S60 Extras Build" class="config" purpose="development">
-        <unit bldFile="S60Extras/group"/>
+        <unit bldFile="s60extras/group"/>
       </component>
     </collection>
     <collection id="version" name="Version" level="top">
     	<!-- collection is really a component. Need to move down a directory -->    
       <component id="version_build" filter="s60" name="Version Build" class="config" purpose="development">
-        <unit bldFile="Version/group"/>
+        <unit bldFile="version/group"/>
       </component>
-    </collection>   
+    </collection>
     <collection id="symbianosbld" name="Symbian OS Build" level="bld">
       <component id="cedarutils" name="Cedar Utils" purpose="development">
         <unit mrp="symbianosbld/cedarutils/tools_utils_cedar.mrp"/>
@@ -25,7 +25,7 @@
       <component id="system_model" name="System Model" class="config" introduced="^2" purpose="development" target="desktop">
         <unit mrp="foundation_system/system_model/system_model.mrp"/>
       </component>
-      <component id="sf_config" name="Foundation Config" introduced="^4">
+      <component id="sf_config" filter="s60" name="Foundation Config" introduced="^4">
         <unit bldFile="foundation_system/sf_config/CI_external/group"/>
       </component>
       <component id="config" filter="s60" name="Config" class="config" purpose="development">
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/os/devicesrv/package_definition.xml
--- a/symbian4/os/devicesrv/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/os/devicesrv/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -363,9 +363,7 @@
     <meta rel="config">
      <defined condition="__HWRM_TARGET_MODIFIER_PLUGIN"/>
     </meta>
-    <!-- uncomment the unit when configuration is in place, it's currently #included from resourcemgmt_build, 
-      		may need to  -->
-    <!-- <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/> -->
+    <unit bldFile="resourcemgmt/hwrmtargetmodifierplugin/group"/>
    </component>
    <component id="vibractrl" filter="s60" name="Vibra Control" deprecated="9.1">
     <unit bldFile="resourcemgmt/vibractrl/group"/>
@@ -376,9 +374,8 @@
    <component id="hwresourcesmgrconfig" name="Hardware Resources Manager Config" introduced="^3" purpose="optional" class="config">
     <unit bldFile="resourcemgmt/hwresourcesmgrconfig" mrp="resourcemgmt/hwresourcesmgrconfig/telephony_hwrm-config.mrp"/>
    </component>
-   <component id="resourcemgmt_build" filter="s60" name="Resource Management Build">
-    <!-- Move exports to a self-contained component.
-         	This needs to be kept around until configuration is in place -->
+   <component id="resourcemgmt_data" filter="s60" name="Resource Management Data" class="config">
+    <!-- Move exports to a self-contained component. Or leave as a component but move down a dir -->
     <unit bldFile="resourcemgmt/group"/>
    </component>
    <component id="powerandmemorynotificationservice" name="Power and Memory Notification Service" introduced="6.0" purpose="mandatory">
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/os/graphics/package_definition.xml
--- a/symbian4/os/graphics/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/os/graphics/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -51,7 +51,7 @@
      </component>
     </collection>
     <collection id="graphicstest" name="Graphics Test" level="app-if">
-      <component id="graphicstestharness" name="Graphics Test Harness" introduced="8.1" purpose="development" filter="test">
+      <component id="graphicstestharness" name="Graphics Test Harness" introduced="8.1" purpose="development" filter="test,api_test">
         <unit mrp="graphicstest/graphicstestharness/group/graphics_testharness.mrp" bldFile="graphicstest/graphicstestharness/group"/>
       </component>
       <component id="uibench" name="UI Bench" introduced="9.2" purpose="development">
@@ -131,7 +131,7 @@
       <component id="gdi" name="GDI" purpose="mandatory">
         <unit bldFile="graphicsdeviceinterface/gdi/group" mrp="graphicsdeviceinterface/gdi/group/graphics_gdi.mrp"/>
       </component>
-      <component id="bitgdi" name="BitGDI" purpose="mandatory">
+      <component id="bitgdi" name="BitGDI" purpose="mandatory" filter="api_test"> <!-- just api_test, not test -->
         <unit bldFile="graphicsdeviceinterface/bitgdi/group" mrp="graphicsdeviceinterface/bitgdi/group/graphics_bitgdi.mrp"/>
       </component>
       <component id="colourpalette" name="Colour Palette" introduced="7.0s" purpose="optional">
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/os/imagingext/package_definition.xml
--- a/symbian4/os/imagingext/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/os/imagingext/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -34,7 +34,7 @@
     <meta rel="Api" href="imagingext_plat/ecam_face_tracking_custom_api/ecam_face_tracking_custom_api.metaxml"/>
     <unit bldFile="imagingext_plat/ecam_face_tracking_custom_api/group"/>
    </component>
-   <component id="ecam_use_case_hint_custom_api" class="api" name="ECam Use Case Hint Custom API" filter="s60" introduced="^4">
+   <component id="ecam_use_case_hint_custom_api" class="api" name="ECam Use Case Hint Custom API" filter="s60" introduced="^3">
       <meta rel="Api" href="imagingext_plat/ecam_use_case_hint_custom_api/ecam_use_case_hint_custom_api.metaxml"/>
       <unit bldFile="imagingext_plat/ecam_use_case_hint_custom_api/group"/>
    </component>
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/os/kernelhwsrv/package_definition.xml
--- a/symbian4/os/kernelhwsrv/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/os/kernelhwsrv/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -83,12 +83,9 @@
       <component id="euser" name="User Library" purpose="mandatory">
         <unit bldFile="kernel/eka/euser" mrp="kernel/eka/euser/base_e32_euser.mrp"/>
       </component>
-      <component id="compsupp" name="RVCT Compiler Runtime Support" filter="gt" purpose="mandatory">
+      <component id="compsupp" name="Compiler Runtime Support" filter="gt" purpose="mandatory">
         <unit bldFile="kernel/eka/compsupp" mrp="kernel/eka/compsupp/base_e32_compsupp.mrp"/>
       </component>
-      <component id="compsupp_gcc" name="GCC Compiler Runtime Support" filter="gt,sf_build" purpose="mandatory">
-        <unit bldFile="kernel/eka/compsupp/gcce"/>
-      </component>
       <component id="fileserver" name="File Server" filter="gt" purpose="mandatory">
         <unit bldFile="userlibandfileserver/fileserver/group" mrp="userlibandfileserver/fileserver/group/base_f32.mrp"/>
       </component>
@@ -144,7 +141,7 @@
       <component id="kernelhwsrv_metadata" name="Kernel and Hardware Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
         <unit mrp="kernelhwsrv_info/kernelhwsrv_metadata/kernelhwsrv_metadata.mrp"/>
       </component>
-      <component id="kernelhwsrv_metadata" name="Kernel and Hardware Services Public Documentation" class="doc" introduced="^3" purpose="development">
+      <component id="kernelhwsrv_docpub" name="Kernel and Hardware Services Public Documentation" class="doc" introduced="^3" purpose="development">
         <unit mrp="kernelhwsrv_info/doc_pub/kernelhwsrv_doc_pub.mrp"/>
       </component>
     </collection>
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/os/osrndtools/package_definition.xml
--- a/symbian4/os/osrndtools/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/os/osrndtools/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
- <package id="osrndtools" name="OS R&amp;D tools" levels="fw trace">
+ <package id="osrndtools" name="OS R&amp;D tools" levels="fw trace analysis">
   <collection id="stif" name="STIF" level="fw">
     <component id="stif_plat" filter="s60" name="STIF Platform Interfaces" class="api" purpose="development">
       <unit bldFile="stif/stif_plat/group"/>
@@ -45,32 +45,37 @@
     <meta rel="config">
      <defined condition="__S60_"/>
     </meta>
-    <!-- uncomment the unit when configuration is in place, it's currently #included from stif_build -->
-    <!-- <unit bldFile="stif/stifkerneltestclassbase/group"/>-->
+    <unit bldFile="stif/stifkerneltestclassbase/group"/>
    </component>
-   <component id="stif_build" filter="s60" name="STIF Build" purpose="development">
-    <!--  move exports into self-contained component. Remove this when configuration is in place-->
+   <component id="stif_data" filter="s60" name="STIF Data" purpose="development" class="config">
+    <!--  This is a component. Should move down a directory. or move into other STIF components-->
     <unit bldFile="stif/group"/>
    </component>
   </collection>
-  <collection id="memspy" name="Memspy" level="trace">
-    <component id="memspy_plat" filter="s60" name="Memspy Platform Interfaces" class="api" purpose="development">
+  <collection id="memspy" name="MemSpy" level="trace">
+    <component id="memspy_plat" filter="s60" name="MemSpy Platform Interfaces" class="api" purpose="development">
     <meta rel="Api" href="memspy/memspy_plat/memspy_api/memspy_api.metaxml"/>
       <unit bldFile="memspy/memspy_plat/group"/>
     </component>
-   <component id="driver" filter="s60" name="Memspy Driver" purpose="development">
+   <component id="driver" filter="s60" name="MemSpy Driver" purpose="development">
     <unit bldFile="memspy/driver/group"/>
    </component>
-   <component id="memspy_engine" filter="s60" name="Memspy Engine" purpose="development">
+   <component id="memspy_engine" filter="s60" name="MemSpy Engine" purpose="development">
     <unit bldFile="memspy/engine/group"/>
    </component>
-   <component id="commandline" filter="s60" name="Memspy Command Line" purpose="development">
+   <component id="commandline" filter="s60" name="MemSpy Command Line" purpose="development">
     <unit bldFile="memspy/commandline/group"/>
    </component>
-   <component id="console" filter="s60" name="Memspy Console" purpose="development">
+   <component id="console" filter="s60" name="MemSpy Console" purpose="development">
     <unit bldFile="memspy/console/group"/>
    </component>
-   <component id="memspy_build" filter="s60" name="Memspy Build" purpose="development">
+   <component id="memspyserver" filter="s60" name="MemSpy Server" purpose="development" introduced="^4">
+    <unit bldFile="memspy/MemSpyServer/group"/>
+   </component>
+   <component id="memspyclient" filter="s60" name="MemSpy Client" purpose="development" introduced="^4">
+    <unit bldFile="memspy/MemSpyClient/group"/>
+   </component>
+   <component id="memspy_build" filter="s60" name="MemSpy Build" purpose="development">
     <!--  move exports into self-contained component.-->
     <unit bldFile="memspy/group"/>
    </component>
@@ -115,6 +120,16 @@
     <unit bldFile="hti/group"/>
    </component>
   </collection>
+  <collection id="piprofiler" name="Performance Investigator Profiler" level="analysis">
+     <component id="piprofiler_build" name="Performance Investigator Profiler Build" introduced="^4">
+      <unit bldFile="piprofiler/group"/>
+     </component>
+  </collection>
+  <collection id="analyzetool" name="Analyze Tool" level="analysis">
+     <component id="analyzetool_build" name="Analyze Tool Build" introduced="^4">
+      <unit bldFile="analyzetool/group"/>
+     </component>
+  </collection>
   <collection id="osrndtools_info" name="OS R&amp;D tools Info" level="trace">
    <component id="osrndtools_metadata" name="OS R&amp;D tools Metadata" class="config" introduced="^2" purpose="development" target="desktop">
     <unit mrp="osrndtools_info/osrndtools_metadata/osrndtools_metadata.mrp"/>
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/os/ossrv/package_definition.xml
--- a/symbian4/os/ossrv/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/os/ossrv/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -190,7 +190,7 @@
     <unit bldFile="ofdbus/dbus-glib/group"/>
    </component>
    <component id="ofdbus_rom" filter="s60" name="D-Bus ROM">
-    <!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
+    <!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
             Consider moving IBY file to one of the above as well and removing this component entirely -->
     <unit bldFile="ofdbus/group"/>
    </component>
diff -r e2c657c13ee2 -r 079a06b9ec58 symbian4/os/textandloc/package_definition.xml
--- a/symbian4/os/textandloc/package_definition.xml	Thu Jun 24 13:19:11 2010 +0100
+++ b/symbian4/os/textandloc/package_definition.xml	Fri Jun 25 17:18:04 2010 +0100
@@ -2,10 +2,6 @@
 <SystemDefinition schema="3.0.0">
   <package id="textandloc" name="Text and Localisation Services" levels="encoding util fonts tools text">
     <collection id="textandloc_plat" name="Text and Localisation Platform Interfaces" level="text">
-     <component id="findutil_api" class="api" name="Find Util API" filter="s60">
-      <meta rel="Api" href="textandloc_plat/findutil_api/findutil_api.metaxml"/>
-      <unit bldFile="textandloc_plat/findutil_api/group"/>
-     </component>
      <component id="japanese_language_utilities_api" class="api" name="Japanese Language Utilities API" filter="s60">
       <meta rel="Api" href="textandloc_plat/japanese_language_utilities_api/japanese_language_utilities_api.metaxml"/>
       <unit bldFile="textandloc_plat/japanese_language_utilities_api/group"/>
@@ -15,12 +11,6 @@
       <unit bldFile="textandloc_plat/sortutil_api/group"/>
      </component>
     </collection>
-    <collection id="textandloc_pub" name="Text and Localisation Public Interfaces" level="text">
-     <component id="directory_localizer_api" class="api" name="Directory Localizer API" filter="s60">
-      <meta rel="Api" href="textandloc_pub/directory_localizer_api/directory_localizer_api.metaxml"/>
-      <unit bldFile="textandloc_pub/directory_localizer_api/group"/>
-     </component>
-    </collection>
     <collection id="charconvfw" name="Character Conversion" level="encoding">
       <component id="charconv_fw" name="Character Encoding and Conversion Framework" purpose="optional">
         <unit bldFile="charconvfw/charconv_fw/group" mrp="charconvfw/charconv_fw/group/syslibs_charconv.mrp"/>
@@ -62,19 +52,16 @@
     </collection>
     <collection id="textandlocutils" name="Text and Localisation Utils" level="util">
       <component id="numbergrouping" name="Number Grouping">
-        <unit bldFile="charconvfw/numbergrouping/group"/>
+        <unit bldFile="textandlocutils/numbergrouping/group" mrp="textandlocutils/numbergrouping/group/tls_numbergrouping.mrp"/>
       </component>
       <component id="jplangutil" name="Japanese Language Utilities">
-        <unit bldFile="charconvfw/jplangutil/group"/>
+        <unit bldFile="textandlocutils/jplangutil/group" mrp="textandlocutils/jplangutil/group/tls_jplangutil.mrp"/>
       </component>
       <component id="sortutil" name="Sorting Utility">
-        <unit bldFile="charconvfw/sortutil/group"/>
+        <unit bldFile="textandlocutils/sortutil/group" mrp="textandlocutils/sortutil/group/tls_sortutil.mrp"/>
       </component>
       <component id="inlinetext" name="Inline Text">
-        <unit bldFile="charconvfw/inlinetext/group"/>
-      </component>
-     <component id="nearestlangutil" name="Nearest Language Util" introduced="^2" purpose="mandatory">
-     	<!-- placeholder for split from bafl -->
+        <unit bldFile="textandlocutils/inlinetext/group" mrp="textandlocutils/inlinetext/group/tls_inlinetext.mrp"/>
      </component>
       <component id="numberformatting" name="Number Formatting" introduced="7.0s" purpose="optional">
         <unit bldFile="textrendering/numberformatting/group" mrp="textrendering/numberformatting/group/app-framework_numberconversion.mrp"/>