# HG changeset patch
# User Bob Rosenberg <bob.rosenberg@nokia.com>
# Date 1277908536 -3600
# Node ID 5af341a5ba45fe5ff93f5ae1ea6bd9c5240f6354
# Parent  70b6ce6b8331a73df4b80ee96cc88898ba4097d8# Parent  3eeb0dc69547605290fbdd6092f4c23d1b595471
Catch up to branch

diff -r 3eeb0dc69547 -r 5af341a5ba45 symbian4/app/browserui/package_definition.xml
--- a/symbian4/app/browserui/package_definition.xml	Wed Jun 30 15:16:10 2010 +0100
+++ b/symbian4/app/browserui/package_definition.xml	Wed Jun 30 15:35:36 2010 +0100
@@ -3,7 +3,7 @@
  <package id="browserui" name="Browser UI" levels="utils support ui">
   <collection id="browserui_info" name="Browser UI Info" level="ui">
     <component id="browserui_build" name="Bookmarks Engine Build" introduced="^4">
-      <unit bldFile="." qt:proFile="browserui.pro" qt:qmakeArgs="&quot;what+=plat_101&quot;"/>
+      <unit bldFile="." qt:proFile="browserui.pro"/>
     </component>
   </collection>
  </package>
diff -r 3eeb0dc69547 -r 5af341a5ba45 symbian4/app/commonemail/package_definition.xml
--- a/symbian4/app/commonemail/package_definition.xml	Wed Jun 30 15:16:10 2010 +0100
+++ b/symbian4/app/commonemail/package_definition.xml	Wed Jun 30 15:35:36 2010 +0100
@@ -74,11 +74,6 @@
       <component id="nmframeworkadapter" filter="s60" name="Nmail Framework Adapter" introduced="^4" class="plugin">
         <!-- <unit bldFile="emailuis/nmframeworkadapter" qt:proFile="nmframeworkadapter.pro"/> -->
       </component>
-     <component id="nmhswidget" filter="test,s60,widget_tools" name="Nmail Homescreen Widget">
-	 <!-- temporary built from nmail.pro as a workaround to ServiceFW bug on service regisrtations, fix expected on wk18 MCL
-      <unit bldFile="emailuis/nmhswidget/tsrc/nmhswidgettestapp" qt:proFile="nmhswidgettestapp.pro" qt:qmakeArgs="-r"/>
-	  -->
-     </component>
     </collection>
     <collection id="commonemail_info" name="Email Apps Info" level="app">
     <component id="commonemail_build" name="Email Apps Build"  introduced="^4">
diff -r 3eeb0dc69547 -r 5af341a5ba45 symbian4/app/contacts/package_definition.xml
--- a/symbian4/app/contacts/package_definition.xml	Wed Jun 30 15:16:10 2010 +0100
+++ b/symbian4/app/contacts/package_definition.xml	Wed Jun 30 15:35:36 2010 +0100
@@ -29,11 +29,8 @@
    <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" filter="s60" name="Mobile Contacts Model" introduced="^4">
-    <unit bldFile="phonebookengines/contactsmodel" qt:proFile="contactsmodel.pro"/>
-   </component>
-   <component id="contactsmodel_old" name="Contacts Model" introduced="ER5" purpose="optional">
-    <unit version="2" bldFile="phonebookengines_old/contactsmodel/groupsql" mrp="phonebookengines_old/contactsmodel/groupsql/app-engines_cntmodel.mrp"/>
+   <component id="contactsmodel" name="Contacts Model" introduced="ER5" purpose="optional">
+        <unit version="2" bldFile="phonebookengines_old/contactsmodel/groupsql" mrp="phonebookengines_old/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"/>
@@ -42,13 +39,16 @@
 	<!-- 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="Mobile Contacts Actions" introduced="^4">
+   <component id="cntlistmodel" filter="s60" name="Contact List Model" introduced="^4">
+    <unit bldFile="phonebookengines/cntlistmodel" qt:proFile="cntlistmodel.pro"/>
+   </component>
+   <component id="cntactions" filter="s60" name="Contacts Actions" introduced="^4">
     <unit bldFile="phonebookengines/cntactions" qt:proFile="cntactions.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="simutility" filter="s60" name="SIM Utility" introduced="^4">
+   <component id="cntsimutility" filter="s60" name="Contacts SIM Utility" introduced="^4">
     <unit bldFile="phonebookengines/cntsimutility" qt:proFile="cntsimutility.pro"/>
    </component>
    <component id="cntimageutility" name="Contacts Image Utility" filter="s60" introduced="^4">
@@ -59,15 +59,15 @@
    <component id="phonebooksync" name="Phonebook Sync" purpose="optional" class="plugin">
     <unit bldFile="pimprotocols/phonebooksync/group" mrp="pimprotocols/phonebooksync/group/telephony_phbksync.mrp"/>
    </component>
-   <component id="pbap" name="Bluetooth PBAP" introduced="9.2" purpose="optional">
+   <component id="pbap" filter="s60" name="Bluetooth PBAP" introduced="9.2" purpose="optional">
     <unit bldFile="pimprotocols/pbap/group" mrp="pimprotocols/pbap/group/bluetooth_accesshost.mrp"/>
    </component>
   </collection>
-  <collection id="presencecache" name="Presence Cache"  introduced="^4" level="services">
-   <component id="presencecachesymbian" name="Presence Cache Symbian">
+  <collection id="presencecache" name="Presence Cache" level="support">
+   <component id="presencecachesymbian" filter="s60" name="Presence Cache Symbian" introduced="^4">
     <unit bldFile="presencecache/presencecachesymbian" qt:proFile="presencecachesymbian.pro"/>
    </component>
-   <component id="presencecacheqt" name="Presence Cache Qt">
+   <component id="presencecacheqt" filter="s60" name="Presence Cache Qt" introduced="^4">
     <unit bldFile="presencecache/presencecacheqt" qt:proFile="presencecacheqt.pro"/>
    </component>
   </collection>
diff -r 3eeb0dc69547 -r 5af341a5ba45 symbian4/app/devicecontrol/package_definition.xml
--- a/symbian4/app/devicecontrol/package_definition.xml	Wed Jun 30 15:16:10 2010 +0100
+++ b/symbian4/app/devicecontrol/package_definition.xml	Wed Jun 30 15:35:36 2010 +0100
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
-  <package id="devicecontrol" name="Device Control Daemons" levels="oma mid app">
+<SystemDefinition xmlns:qt="http://www.nokia.com/qt" schema="3.0.0">
+  <package id="devicecontrol" name="Device Control Daemons" levels="support mid app">
+    <collection id="devicemgmtdialogsplugin" name="Device Management Dialogs Plugin" level="support">
+      <!-- need to put component at the proper directory level -->
+      <component id="devicemanagementnotifiersplugin" name="Device Management Notifiers Plugin" filter="s60" introduced="^4" class="plugin">
+        <unit bldFile="devicemgmtdialogsplugin" qt:proFile="devicemgmtdialogsplugin.pro"/>
+      </component>
+    </collection>
     <collection id="deviceupdatesui" name="Device Updates UI" level="app">
-      <component id="deviceupdatesui_adapters" name="Device Updates Adapters" filter="s60" class="plugin" introduced="^4">
-        <unit bldFile="deviceupdatesui/adapters/bld"/>
-      </component>
       <component id="deviceupdates" name="Device Updates" filter="s60" introduced="^4">
         <unit bldFile="deviceupdatesui/deviceupdates" qt:proFile="deviceupdates.pro"/>
       </component>
@@ -14,11 +17,82 @@
       <component id="deviceupdatesqtsp" name="Device Updates Qt Service Provider" filter="s60" introduced="^4">
         <unit bldFile="deviceupdatesui/deviceupdatesqtsp" qt:proFile="deviceupdatesqtsp.pro"/>
       </component>
+    </collection>
+    <collection id="clientprovisioning" name="Client Provisioning" level="mid">
       <component id="cpqtsp" name="Client Provisioning Qt Service Provider" filter="s60" introduced="^4">
-        <unit bldFile="deviceupdatesui/cpqtsp" qt:proFile="cpqtsp.pro"/>
+        <unit bldFile="clientprovisioning/cpqtsp" qt:proFile="cpqtsp.pro"/>
+      </component>
+    </collection>
+    <collection id="omadmadapters" name="OMA DM Adapters" level="support">
+      <component id="omadmadapters_build" name="OMA DM Adapters Build" filter="s60">
+        <!-- need to split IBY into the components or make this a ROM component -->
+        <unit bldFile="omadmadapters/bld"/>
+      </component>
+      <component id="devinfo" name="Device Info" filter="s60">
+        <unit bldFile="omadmadapters/devinfo/bld"/>
+      </component>
+      <component id="devdetail" name="Device Detail" filter="s60">
+        <unit bldFile="omadmadapters/devdetail/bld"/>
+      </component>
+      <component id="syncmldm" name="SyncML DM" filter="s60">
+        <unit bldFile="omadmadapters/syncmldm/bld"/>
+      </component>
+      <component id="syncmldm12" name="SyncML DM 1.2" filter="s60">
+        <unit bldFile="omadmadapters/syncmldm12/bld"/>
+      </component>
+      <component id="omadm_browseradapter" name="Browser Adapter" filter="s60" class="plugin">
+        <!--  <unit bldFile="omadmadapters/browseradapter/bld"/> -->
+      </component>
+      <component id="omadm_streamingadapter" name="Streaming Adapter" filter="s60" class="plugin">
+        <unit bldFile="omadmadapters/streamingadapter/bld"/>
+      </component>
+      <component id="globalwlansettings" name="Global WLAN Settings" filter="s60">
+        <unit bldFile="omadmadapters/globalwlansettings/group"/>
+      </component>
+      <component id="nsmldminternet" name="nsmldminternet" filter="s60">
+        <!--  <unit bldFile="omadmadapters/nsmldminternet/group"/> -->
+      </component>
+      <component id="nsmldmalwaysonadapter" name="Always Online Device Management Adapter" filter="s60" introduced="9.1" class="plugin">
+        <unit bldFile="omadmadapters/nsmldmalwaysonadapter/group"/>
       </component>
-      <component id="devicemanagementnotifiersplugin" name="Device Management Notifiers Plugin" filter="s60" introduced="^4" class="plugin">
-        <unit bldFile="deviceupdatesui/devicemanagementnotifiersplugin" qt:proFile="devicemanagementnotifiersplugin.pro"/>
+      <component id="nsmldmbmadapter" name="NSML DM BM Adapter" filter="s60" class="plugin">
+        <unit bldFile="omadmadapters/nsmldmbmadapter/group"/>
+      </component>
+      <component id="connmoadapter" name="Connection Management Object Adapter" filter="s60" class="plugin">
+        <unit bldFile="omadmadapters/connmoadapter/group"/>
+      </component>
+      <component id="syncmlds" name="SyncML Data Sync" filter="s60">
+        <meta rel="config">
+          <defined condition="__SYNCML_DM_DS"/>
+        </meta>
+        <unit bldFile="omadmadapters/syncmlds/bld"/>
+      </component>
+      <component id="omadm_email" name="OMA DM Email" filter="s60">
+        <meta rel="config">
+          <defined condition="__SYNCML_DM_EMAIL"/>
+        </meta>
+        <unit bldFile="omadmadapters/email/bld"/>
+      </component>
+      <component id="omadm_mms" name="OMA DM MMS" filter="s60">
+        <meta rel="config">
+          <defined condition="__SYNCML_DM_MMS"/>
+        </meta>
+        <unit bldFile="omadmadapters/mms/bld"/>
+      </component>
+      <component id="omadm_fota" name="OMA DM FOTA" filter="s60">
+        <meta rel="config">
+          <defined condition="__SYNCML_DM_FOTA"/>
+        </meta>
+        <!--  <unit bldFile="omadmadapters/fota/bld"/> -->
+      </component>
+      <component id="omadm_imps" name="OMA DM IMPS" filter="s60">
+        <meta rel="config">
+          <defined condition="__SYNCML_DM_IMPS"/>
+        </meta>
+        <!--  <unit bldFile="omadmadapters/imps/bld"/> -->
+      </component>
+      <component id="dcmodmadapter" name="DC Management Object  DM Adapter" filter="s60" class="plugin">
+        <!--  <unit bldFile="omadmadapters/dcmodmadapter/group"/> -->
       </component>
     </collection>
   </package>
diff -r 3eeb0dc69547 -r 5af341a5ba45 symbian4/app/helps/package_definition.xml
--- a/symbian4/app/helps/package_definition.xml	Wed Jun 30 15:16:10 2010 +0100
+++ b/symbian4/app/helps/package_definition.xml	Wed Jun 30 15:35:36 2010 +0100
@@ -12,10 +12,5 @@
         <unit bldFile="symhelp/helpmodel/group" mrp="symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
       </component>
     </collection>
-    <collection id="helps_info" name="Help Apps Info" level="ui">
-      <component id="helps_metadata" name="Help Apps Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-        <unit mrp="helps_info/helps_metadata/helps_metadata.mrp"/>
-      </component>
-    </collection>
   </package>
 </SystemDefinition>
diff -r 3eeb0dc69547 -r 5af341a5ba45 symbian4/app/musicplayer/package_definition.xml
--- a/symbian4/app/musicplayer/package_definition.xml	Wed Jun 30 15:16:10 2010 +0100
+++ b/symbian4/app/musicplayer/package_definition.xml	Wed Jun 30 15:35:36 2010 +0100
@@ -2,7 +2,18 @@
 <SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
  <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="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="musicplayer_utilities " name="Music Player Utilities" level="support">
    <component id="mpnowplayingbanner" filter="s60" name="MP Now Playing Banner" introduced="^4">
 	<!-- <unit bldFile="utilities/mpnowplayingbanner" qt:proFile="mpnowplayingbanner.pro" qt:qmakeArgs="-r -config rom"/> -->
@@ -23,18 +34,6 @@
 	<!-- <unit bldFile="app" qt:proFile="app.pro" qt:qmakeArgs="-r -config rom"/> -->
    </component>
   </collection>
-  <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" qt:proFile="mpcollectionviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
@@ -52,6 +51,11 @@
     <!--<unit bldFile="mpviewplugins/mpmediawallviewplugin" qt:proFile="mpmediawallviewplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
    </component>
   </collection>
+  <collection id="musicwidgetplugin" name="Music Widget Plugin" level="plugins">
+   <component id="musicwidgetplugin_build" filter="s60" name="Music Widget Plugin" introduced="^4" class="plugin">
+    <!--<unit bldFile="musicwidgetplugin" qt:proFile="musicwidgetplugin.pro" qt:qmakeArgs="-r -config rom"/> -->
+   </component>
+  </collection>
   <collection id="mpserviceplugins" name="Music Player Service Plugins" level="plugins">
    <component id="audioeffects" filter="s60" name="Audio Effects" introduced="^4" class="plugin">
     <!--<unit bldFile="mpserviceplugins/audioeffects/group"/>-->
diff -r 3eeb0dc69547 -r 5af341a5ba45 symbian4/app/organizer/package_definition.xml
--- a/symbian4/app/organizer/package_definition.xml	Wed Jun 30 15:16:10 2010 +0100
+++ b/symbian4/app/organizer/package_definition.xml	Wed Jun 30 15:35:36 2010 +0100
@@ -40,6 +40,9 @@
    <component id="notes_editor_api" name="Notes Editor API" class="api" filter="s60" introduced="^4">
     <unit base="organizer_plat/notes_editor_api"/>
    </component>
+   <component id="clock_settingsview_plugin_api" name="Clock Settings View Plugin API" class="api" filter="s60" introduced="^4">
+    <unit base="organizer_plat/clock_settingsview_plugin_api"/>
+   </component>
   </collection>
   <collection id="agendainterface" name="Agenda Interface" level="services">
    <!-- collection is really a component, should move down a directory -->
@@ -56,7 +59,7 @@
    </component>
    <component id="caleneditor" filter="s60" name="Calendar Editor" introduced="^4">
     <unit bldFile="calendarui/caleneditor" qt:proFile="caleneditor.pro"/>
-   </component>
+   </component>   
    <component id="agendaeventviewer" filter="s60" name="Agenda Event Viewer" introduced="^4" >
     <unit bldFile="calendarui/agendaeventviewer" qt:proFile="agendaeventviewer.pro"/>
    </component>
@@ -72,7 +75,7 @@
    <component id="customisationmanager" filter="s60" name="Calendar Customisation Manager">
     <unit bldFile="calendarui/customisationmanager" qt:proFile="customisationmanager.pro"/>
    </component>
-   <component id="views" filter="s60" name="Calendar Views">
+   <component id="calendarui_views" filter="s60" name="Calendar Views">
     <unit bldFile="calendarui/views" qt:proFile="views.pro"/>
    </component>
    <component id="calendarui_controller" filter="s60" name="Calendar Controller">
@@ -84,14 +87,14 @@
    <component id="regionalplugins" name="Regional Plugins" filter="s60" introduced="^4" class="plugin">
       <unit bldFile="calendarui/regionalplugins" qt:proFile="regionalplugins.pro"/>
    </component>
+   <component id="calenviewerservice" name="Calendar Viewer Service" filter="s60" introduced="^4" class="plugin">
+      <unit bldFile="calendarui/calenviewerservice" qt:proFile="calenviewerservice.pro"/>
+   </component>
    <component id="caldav" filter="sf_build" name="CalDAV" class="plugin" introduced="^3">
     <!-- not yet delivered in S^4 <unit bldFile="calendarui/caldav/group"/>-->
    </component>
   </collection>
   <collection id="notes" name="Notes" level="ui">
-   <component id="noteseditor" filter="s60" name="Notes Editor" introduced="^4">
-    <unit bldFile="notes/notesui/noteseditor" qt:proFile="noteseditor.pro"/>
-   </component>
    <component id="notes_build" filter="s60" name="Notes Build" introduced="^4">
     <unit bldFile="notes" qt:proFile="notes.pro"/>
    </component>
diff -r 3eeb0dc69547 -r 5af341a5ba45 symbian4/app/phone/package_definition.xml
--- a/symbian4/app/phone/package_definition.xml	Wed Jun 30 15:16:10 2010 +0100
+++ b/symbian4/app/phone/package_definition.xml	Wed Jun 30 15:35:36 2010 +0100
@@ -61,9 +61,6 @@
    <component id="phoneservices" filter="s60" name="Phone Server" introduced="^4">
     <unit bldFile="phoneengine/phoneservices" qt:proFile="phoneservices.pro"/>
    </component>
-   <component id="parserrecognizer" filter="s60" name="Parser Recognizer" introduced="^4" class="plugin">
-    <unit bldFile="phoneengine/parserrecognizer" qt:proFile="parserrecognizer.pro"/>
-   </component>
   </collection>
   <collection id="phoneuis" name="Phone UIs" level="ui">
    <component id="bubblemanager2" filter="s60" name="Phone Bubble Manager">
diff -r 3eeb0dc69547 -r 5af341a5ba45 symbian4/app/photos/package_definition.xml
--- a/symbian4/app/photos/package_definition.xml	Wed Jun 30 15:16:10 2010 +0100
+++ b/symbian4/app/photos/package_definition.xml	Wed Jun 30 15:35:36 2010 +0100
@@ -20,12 +20,22 @@
    </component>
   </collection>
   <collection id="photos_ui" name="Photos UI" level="ui">
+	<!-- need to move exports from ui.pro into separate .pro or bld.inf -->
+   <component id="detailscustomwidget " filter="s60" name="Details Custom Widget" introduced="^4">
+    <!--<unit bldFile="ui/detailscustomwidget " qt:proFile="detailscustomwidget .pro"/> -->
+   </component>
    <component id="photos_uiengine" filter="s60" name="Photos UI Engine" introduced="^4">
     <!--<unit bldFile="ui/uiengine" qt:proFile="uiengine.pro"/> -->
    </component>
    <component id="photos_commandhandlers" filter="s60" name="Photos Command Handlers" introduced="^4">
     <!--<unit bldFile="ui/commandhandlers" qt:proFile="commandhandlers.pro"/> -->
    </component>
+   <component id="photos_viewutilities" filter="s60" name="Photos View Utilities" introduced="^4">
+    <!--<unit bldFile="ui/viewutilities" qt:proFile="commandhandlers.pro"/> -->
+   </component>
+   <component id="photos_widgets" filter="s60" name="Photos Widgets" introduced="^4">
+    <!--<unit bldFile="ui/widgets" qt:proFile="widgets.pro"/> -->
+   </component>
    <component id="photos_views" filter="s60" name="Photos Views" introduced="^4">
     <!--<unit bldFile="ui/views" qt:proFile="views.pro"/> -->
    </component>
diff -r 3eeb0dc69547 -r 5af341a5ba45 symbian4/app/radio/package_definition.xml
--- a/symbian4/app/radio/package_definition.xml	Wed Jun 30 15:16:10 2010 +0100
+++ b/symbian4/app/radio/package_definition.xml	Wed Jun 30 15:35:36 2010 +0100
@@ -32,15 +32,10 @@
         <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"/>
+    <collection id="radiohswidget" name="Radio Homescreen Widget" level="plugin">
+		<!-- collection is really a component. Move down a directory -->
+      <component id="radiohswidget_build" filter="s60" name="Radio HS Widget Build" introduced="^4">
+        <unit bldFile="radiohswidget" qt:proFile="radiohswidget.pro"/>
       </component>
     </collection>
   </package>
diff -r 3eeb0dc69547 -r 5af341a5ba45 symbian4/app/videoplayer/package_definition.xml
--- a/symbian4/app/videoplayer/package_definition.xml	Wed Jun 30 15:16:10 2010 +0100
+++ b/symbian4/app/videoplayer/package_definition.xml	Wed Jun 30 15:35:36 2010 +0100
@@ -11,7 +11,11 @@
   </collection>
   <collection id="videocollection" name="Video Collection" level="util">
    <component id="mpxmyvideoscollection" filter="s60" name="MPX My Videos Collection" introduced="^3">
-    <unit bldFile="videocollection/mpxmyvideoscollection/group"/>
+	  <meta rel="testbuild">
+		<group name="vado.101_mpxmyvideoscollection_tsrc"/>
+       </meta>
+    <unit bldFile="videocollection/mpxmyvideoscollection/group" filter="!test"/>
+    <unit bldFile="videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/group" filter="test,unit_test"/>
    </component>
    <component id="videocollectionwrapper" filter="s60" name="Video Collection Wrapper" introduced="^4">
     <unit bldFile="videocollection/videocollectionwrapper" qt:proFile="videocollectionwrapper.pro" qt:qmakeArgs="-r"/>
@@ -19,7 +23,7 @@
      <component id="videocollectionwrapper_test" filter="test,qt_unit_test" name="Video Collection Wrapper Tests" introduced="^4">
       <!--Can only have one unit. Need to split into separate component or #include from a common file-->
       <meta rel="testbuild">
-       <group name="vado.videocollection.tsrc"/>
+       <group name="vado.101_videocollection_qt.tsrc"/>
       </meta>
       <unit bldFile="videocollection/videocollectionwrapper/tsrc/testvideocollectionclient" qt:proFile="testvideocollectionclient.pro"/>
       <unit bldFile="videocollection/videocollectionwrapper/tsrc/testvideocollectionlistener" qt:proFile="testvideocollectionlistener.pro"/>
@@ -39,7 +43,7 @@
     <component id="videocollectionview_test" filter="test,qt_unit_test" name="Video Collection View Tests">
       <!--Can only have one unit. Need to split into separate components or #include from a common file-->
       <meta rel="testbuild">
-       <group name="vado.videocollection.tsrc"/>
+       <group name="vado.101_videocollection_qt.tsrc"/>
       </meta>
       <unit bldFile="videocollection/videocollectionview/tsrc/testcollectionview" qt:proFile="testcollectionview.pro"/>
       <unit bldFile="videocollection/videocollectionview/tsrc/testhintwidget" qt:proFile="testhintwidget.pro"/>
@@ -54,17 +58,19 @@
    </component>
   </collection>
   <collection id="mediasettings" name="Media Settings" level="support">
-   <!--  this is really a component. Should be moved down a directory -->
-   <component id="mediasettings_build" filter="s60" name="Media Settings Build">
-    <unit bldFile="mediasettings/group"/>
+   <component id="mediasettingsengine" filter="s60" name="Media Settings Engine">
+    <unit bldFile="mediasettings/mediasettingsengine/group"/>
+   </component>
+   <component id="videosettingsplugin" filter="s60" name="Video Settings Plugin" class="plugin">
+    <!--<unit bldFile="mediasettings/videosettingsplugin" qt:proFile="videosettingsplugin.pro"/> -->
    </component>
   </collection>
   <collection id="videoplayerapp" name="Video Player App" level="apps">
    <component id="videoplayerengine" name="Video Player Engine" filter="s60"  introduced="^4">
     <unit bldFile="videoplayerapp/videoplayerengine" qt:proFile="videoplayerengine.pro" qt:qmakeArgs="-r"/>
    </component>
-   <component id="hbvideoplayer" filter="s60" name="HB Video Player" introduced="^4">
-    <unit bldFile="videoplayerapp/hbvideoplayer" qt:proFile="hbvideoplayer.pro" qt:qmakeArgs="-r"/>
+   <component id="hbvideoplayer" filter="s60" name="Video Player" introduced="^4">
+    <unit bldFile="videoplayerapp/videoplayer" qt:proFile="videoplayer.pro" qt:qmakeArgs="-r"/>
    </component>
   </collection>
   <collection id="videoplayback" name="Video Playback Plugins" level="plugin">
@@ -75,9 +81,12 @@
     <unit bldFile="videoplayback/hbvideoplaybackviewplugin"  qt:proFile="hbvideoplaybackviewplugin.pro" qt:qmakeArgs="-r"/>
    </component>
    <component id="videohelix" name="Video Helix" filter="s60" introduced="^3" class="plugin">
-    <unit bldFile="videoplayback/videohelix/group"/>
+	  <meta rel="testbuild">
+		<group name="vado.101_videoplayback_tsrc"/>
+       </meta>
+    <unit bldFile="videoplayback/videohelix/group" filter="!test"/>
+    <unit bldFile="videoplayback/videohelix/tsrc/ut_videohelixtest/group" filter="test,unit_test"/>
    </component>
   </collection>
  </package>
 </SystemDefinition>
-