# HG changeset patch
# User Bob Rosenberg <bob.rosenberg@nokia.com>
# Date 1277909914 -3600
# Node ID dc8c3f5ca92a00c49cf57297db811e5db2977d50
# Parent  e2b817b081346983c8d0265a49f17f6b2d31c5d1
Bring mw layer pkgdefs up to date with latest code drop

diff -r e2b817b08134 -r dc8c3f5ca92a symbian4/mw/accesssec/package_definition.xml
--- a/symbian4/mw/accesssec/package_definition.xml	Wed Jun 30 15:46:53 2010 +0100
+++ b/symbian4/mw/accesssec/package_definition.xml	Wed Jun 30 15:58:34 2010 +0100
@@ -21,7 +21,7 @@
   </collection>
   <collection id="eapol" name="EAPOL" level="framework">
    <component id="eapol_framework" filter="s60" name="EAPOL Framework" introduced="9.2">
-    <unit bldFile="eapol/eapol_framework/eapol_symbian/group"/>
+    <unit bldFile="eapol/group"/>
    </component>
   </collection>
  </package>
diff -r e2b817b08134 -r dc8c3f5ca92a symbian4/mw/appsupport/package_definition.xml
--- a/symbian4/mw/appsupport/package_definition.xml	Wed Jun 30 15:46:53 2010 +0100
+++ b/symbian4/mw/appsupport/package_definition.xml	Wed Jun 30 15:58:34 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="appsupport" name="Generic Application Support" levels="system plugin framework server generic specific">
   <collection id="appsupport_pub" name="Generic Application Support Public Interfaces" level="specific">
    <component id="flash_viewer_framework_api" name="Flash Viewer Framework API" class="api" filter="s60">
@@ -197,6 +197,9 @@
    <component id="atcmdplugin" name="AT Command Plugin" class="plugin" filter="s60,!oem_build">
       <unit bldFile="coreapplicationuis/atcmdplugin/group"/>
    </component>
+   <component id="devicepowermenuplugin" name="Device Power Menu Plugin" class="plugin" introduced="^4">
+      <unit bldFile="coreapplicationuis/devicepowermenuplugin" qt:proFile="devicepowermenuplugin.pro"/>
+   </component>
   </collection>
   <collection id="flashliteapi_3_1" name="Flash Lite API 3.1" level="specific">
    <!--  collection is really a component. Move down a directory -->
diff -r e2b817b08134 -r dc8c3f5ca92a symbian4/mw/browser/package_definition.xml
--- a/symbian4/mw/browser/package_definition.xml	Wed Jun 30 15:46:53 2010 +0100
+++ b/symbian4/mw/browser/package_definition.xml	Wed Jun 30 15:58:34 2010 +0100
@@ -3,7 +3,7 @@
  <package id="browser" name="Browser" levels="plugin utils support main">
   <collection id="bookmarksengine" name="Bookmarks Engine" level="support">
     <component id="bookmarksengine_build" name="Bookmarks Engine Build" introduced="^4">
-      <unit bldFile="bookmarksengine" qt:proFile="bookmarksengine.pro" qt:qmakeArgs="&quot;what+=plat_101&quot;"/>
+      <unit bldFile="bookmarksengine" qt:proFile="bookmarksengine.pro"/>
     </component>
   </collection>
  </package>
diff -r e2b817b08134 -r dc8c3f5ca92a symbian4/mw/btservices/package_definition.xml
--- a/symbian4/mw/btservices/package_definition.xml	Wed Jun 30 15:46:53 2010 +0100
+++ b/symbian4/mw/btservices/package_definition.xml	Wed Jun 30 15:58:34 2010 +0100
@@ -26,15 +26,18 @@
    </component>
    <component id="bluetooth_engine_connection_management_api" name="Bluetooth Engine Connection Management API" class="api" filter="s60">
     <meta rel="Api" href="btservices_plat/bluetooth_engine_connection_management_api/bluetooth_engine_connection_management_api.metaxml"/>
-    <unit bldFile="btservices_plat/bluetooth_engine_connection_management_api/group"/>
+    <unit bldFile="btservices_plat/bluetooth_engine_connection_management_api/group" filter="!test"/>
+    <unit bldFiile="btservices_plat/bluetooth_engine_connection_management_api/tsrc/group"  filter="test,api_test"/>
    </component>
    <component id="bluetooth_engine_device_management_api" name="Bluetooth Engine Device Management API" class="api" filter="s60">
     <meta rel="Api" href="btservices_plat/bluetooth_engine_device_management_api/bluetooth_engine_device_management_api.metaxml"/>
-    <unit bldFile="btservices_plat/bluetooth_engine_device_management_api/group"/>
+    <unit bldFile="btservices_plat/bluetooth_engine_device_management_api/group" filter="!test"/>
+    <unit bldFiile="btservices_plat/bluetooth_engine_device_management_api/tsrc/group"  filter="test,api_test"/>
    </component>
    <component id="bluetooth_engine_discovery_api" name="Bluetooth Engine Discovery API" class="api" filter="s60">
     <meta rel="Api" href="btservices_plat/bluetooth_engine_discovery_api/bluetooth_engine_discovery_api.metaxml"/>
-    <unit bldFile="btservices_plat/bluetooth_engine_discovery_api/group"/>
+    <unit bldFile="btservices_plat/bluetooth_engine_discovery_api/group" filter="!test"/>
+    <unit bldFiile="btservices_plat/bluetooth_engine_discovery_api/tsrc/group"  filter="test,api_test"/>
    </component>
    <component id="bluetooth_engine_features_api" name="Bluetooth Engine Features API" class="api" filter="s60">
     <meta rel="Api" href="btservices_plat/bluetooth_engine_features_api/bluetooth_engine_features_api.metaxml"/>
@@ -42,7 +45,8 @@
    </component>
    <component id="bluetooth_engine_settings_api" name="Bluetooth Engine Settings API" class="api" filter="s60">
     <meta rel="Api" href="btservices_plat/bluetooth_engine_settings_api/bluetooth_engine_settings_api.metaxml"/>
-    <unit bldFile="btservices_plat/bluetooth_engine_settings_api/group"/>
+    <unit bldFile="btservices_plat/bluetooth_engine_settings_api/group" filter="!test"/>
+    <unit bldFiile="btservices_plat/bluetooth_engine_settings_api/tsrc/group"  filter="test,api_test"/>
    </component>
    <component id="bluetooth_engine_plugin_api" name="Bluetooth Engine Plugin API" class="api" filter="s60">
     <meta rel="Api" href="btservices_plat/bluetooth_engine_plugin_api/bluetooth_engine_plugin_api.metaxml"/>
@@ -64,6 +68,21 @@
     <meta rel="Api" href="btservices_plat/bluetooth_secondary_display_notification_api/bluetooth_secondary_display_notification_api.metaxml"/>
     <unit bldFile="btservices_plat/bluetooth_secondary_display_notification_api/group"/>
    </component>
+   <component id="obex_secondary_display_notification_api" name="OBEX Secondary Display Notification API" class="api" filter="s60">
+    <meta rel="Api" href="btservices_plat/obex_secondary_display_notification_api/obex_secondary_display_notification_api.metaxml"/>
+    <unit bldFile="btservices_plat/obex_secondary_display_notification_api/group"/>
+   </component>
+   <component id="obex_service_plugin_api" name="OBEX Service Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="btservices_plat/obex_service_plugin_api/obex_service_plugin_api.metaxml"/>
+    <unit bldFile="btservices_plat/obex_service_plugin_api/group"/>
+   </component>
+   <component id="obex_service_utils_api" name="OBEX Service Utils API" class="api" filter="s60">
+    <meta rel="Api" href="btservices_plat/obex_service_utils_api/obex_service_utils_api.metaxml"/>
+    <unit bldFile="btservices_plat/obex_service_utils_api/group"/>
+   </component>
+   <component id="usb_obexservicemanager_client_api" name="OBEX Service Manager Client API" class="api" filter="s60">
+    <unit bldFile="btservices_plat/usb_obexservicemanager_client_api/group"/>
+   </component>
   </collection>
   <collection id="bluetoothengine" name="Bluetooth Engine" level="framework">
    <component id="btnotifclient" filter="s60" name="Bluetooth Notification Client" introduced="^4">
@@ -74,7 +93,8 @@
     <unit bldFile="bluetoothengine/bteng/group"/>
    </component>
    <component id="btserviceutil" filter="s60" name="Bluetooth Service Utils" introduced="^4">
-    <unit bldFile="bluetoothengine/btserviceutil/group"/>
+    <unit bldFile="bluetoothengine/btserviceutil/group" filter="!test"/>
+    <unit bldFiile="bluetoothengine/btserviceutil/tsrc/btserviceutiltest/group"  filter="test,api_test"/>
    </component>
    <component id="btnotif" filter="s60" name="Bluetooth Notifier">
     <unit bldFile="bluetoothengine/btnotif/group"/>
@@ -83,7 +103,8 @@
     <unit bldFile="bluetoothengine/btnotif/btdevicedialogplugin" qt:proFile="btdevicedialogplugin.pro"/>
    </component>
    <component id="btaudioman" filter="s60" name="Bluetooth Audio Manager">
-    <unit bldFile="bluetoothengine/btaudioman/group"/>
+    <unit bldFile="bluetoothengine/btaudioman/group" filter="!test"/>
+    <unit bldFiile="bluetoothengine/btaudioman/tsrc/btAudioManApiTest/group"  filter="test,api_test"/>
    </component>
    <component id="btmac" filter="s60" name="Bluetooth Mono Audio Controller" class="plugin">
     <unit bldFile="bluetoothengine/btmac/group"/>
@@ -92,7 +113,8 @@
     <unit bldFile="bluetoothengine/btsac/group"/>
    </component>
    <component id="btaudiostreamer" filter="s60" name="Bluetooth Audio Streamer">
-    <unit bldFile="bluetoothengine/btaudiostreamer/group"/>
+    <unit bldFile="bluetoothengine/btaudiostreamer/group" filter="!test"/>
+    <unit bldFiile="bluetoothengine/btaudiostreamer/tsrc/BtAudioStreamerApiTest/group" filter="test,api_test"/>
    </component>
    <component id="btsap" filter="s60" name="Bluetooth SIM Access Profile" class="plugin">
     <unit bldFile="bluetoothengine/btsap/group"/>
@@ -123,18 +145,30 @@
     <unit bldFile="atcommands/lccustomplugin/group"/>
    </component>
   </collection>
-  <collection id="cbsatplugin" name="CBS AT Plugin">
+  <collection id="cbsatplugin" name="CBS AT Plugin" level="plugin">
      <component id="atmisccmdplugin" name="AT Misc Commands Plugin"  filter="s60" class="plugin" introduced="^4">
       <unit bldFile="cbsatplugin/atmisccmdplugin/group"/>
      </component>
   </collection>
+  <collection id="btobexprofiles" name="BT OBEX Profiles" level="generic">
+     <component id="obexreceiveservices" name="OBEX Receive Services"  filter="s60">
+      <unit bldFile="btobexprofiles/obexreceiveservices/group"/>
+     </component>
+     <component id="obexsendservices" name="OBEX Send Services"  filter="s60">
+      <unit bldFile="btobexprofiles/obexsendservices/group"/>
+     </component>
+     <component id="obexhighway" name="OBEX Highway"  filter="s60" introduced="^4">
+		<!-- should be moved out from under obexsendservices into own component dir -->
+        <unit bldFile="btobexprofiles/obexsendservices/obexhighway" qt:proFile="obexhighway.pro"/>
+     </component>
+     <component id="obexserviceman" name="OBEX Service Manager"  filter="s60">
+      <unit bldFile="btobexprofiles/obexserviceman/group"/>
+     </component>
+  </collection>
   <collection id="btservices_info" name="BT Services Info" level="plugin">
    <component id="btservices_metadata" name="BT Services Metadata" class="config" introduced="^3" purpose="development" target="desktop">
     <unit mrp="btservices_info/btservices_metadata/btservices_metadata.mrp"/>
    </component>
-   <component id="btservices_api_test" name="BT Services API Tests" purpose="development" filter="s60,test,api_test">
-    <unit bldFiile="tsrc/group"/>
-   </component>
   </collection>
  </package>
 </SystemDefinition>
diff -r e2b817b08134 -r dc8c3f5ca92a symbian4/mw/classicui/package_definition.xml
--- a/symbian4/mw/classicui/package_definition.xml	Wed Jun 30 15:46:53 2010 +0100
+++ b/symbian4/mw/classicui/package_definition.xml	Wed Jun 30 15:58:34 2010 +0100
@@ -289,8 +289,7 @@
    </component>
    <component id="common_file_dialogs_filter_factory_api" name="Common File Dialogs Filter Factory API" class="api" filter="s60">
     <meta rel="Api" href="classicui_plat/common_file_dialogs_filter_factory_api/common_file_dialogs_filter_factory_api.metaxml"/>
-    <unit bldFile="classicui_plat/common_file_dialogs_filter_factory_api/group" filter="!test"/>
-    <unit bldFile="classicui_plat/common_file_dialogs_filter_factory_api/tsrc/group" filter="test,api_test"/>
+    <unit bldFile="classicui_plat/common_file_dialogs_filter_factory_api/group"/>
    </component>
    <component id="avkon_anim_dll_api" name="AVKON Anim DLL API" class="api" filter="s60">
     <meta rel="Api" href="classicui_plat/avkon_anim_dll_api/avkon_anim_dll_api.metaxml"/>
@@ -446,8 +445,7 @@
    </component>
    <component id="common_file_dialogs_api" name="Common File Dialogs API" class="api" filter="s60">
     <meta rel="Api" href="classicui_pub/common_file_dialogs_api/common_file_dialogs_api.metaxml"/>
-    <unit bldFile="classicui_pub/common_file_dialogs_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/common_file_dialogs_api/tsrc/group" filter="test,api_test"/>
+    <unit bldFile="classicui_pub/common_file_dialogs_api/group"/>
    </component>
    <component id="dialog_shutter_api" name="Dialog Shutter API" class="api" filter="s60">
     <meta rel="Api" href="classicui_pub/dialog_shutter_api/dialog_shutter_api.metaxml"/>
diff -r e2b817b08134 -r dc8c3f5ca92a symbian4/mw/drm/package_definition.xml
--- a/symbian4/mw/drm/package_definition.xml	Wed Jun 30 15:46:53 2010 +0100
+++ b/symbian4/mw/drm/package_definition.xml	Wed Jun 30 15:58:34 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="drm" name="DRM" levels="plugin framework server generic specific">
   <collection id="drm_plat" name="DRM Platform Interfaces" level="specific">
    <component id="roap_api" name="ROAP API" class="api" filter="s60">
@@ -85,8 +85,8 @@
   </collection>
   <collection id="commondrm" name="Common DRM" level="generic">
    <!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
-   <component id="drmencryptor" filter="s60" name="DRM Encryptor">
-    <!-- this should have its own bld.inf or be removed as a component -->
+   <component id="drmqtencryptor" filter="s60" name="DRM Qt Encryptor" introduced="^4">
+    <unit bldFile="commondrm/drmqtencryptor"  qt:proFile="qt_drmencryptor.pro" qt:qmakeArgs="-r" />
    </component>
    <component id="drmrightsmanagerui" filter="s60" name="DRM Rights Manager UI">
     <unit bldFile="commondrm/drmrightsmanagerui/help/group"/>
diff -r e2b817b08134 -r dc8c3f5ca92a symbian4/mw/hgwidgets/package_definition.xml
--- a/symbian4/mw/hgwidgets/package_definition.xml	Wed Jun 30 15:46:53 2010 +0100
+++ b/symbian4/mw/hgwidgets/package_definition.xml	Wed Jun 30 15:58:34 2010 +0100
@@ -15,11 +15,11 @@
     </collection>
     <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">
+      <component id="ganeswidgets_build" name="Ganes Widgets Build" introduced="^4" filter="build_as_app">
         <unit bldFile="ganeswidgets" qt:proFile="ganeswidgets.pro"/>
 	 </component>
     </collection>	 
-    <collection id="hgcacheproxymodel" name="Hurriganes Cache Proxy Model" level="framework">
+    <collection id="hgcacheproxymodel" name="Hurriganes Cache Proxy Model" level="framework" filter="build_as_app">
 		<!-- 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"/>
diff -r e2b817b08134 -r dc8c3f5ca92a symbian4/mw/inputmethods/package_definition.xml
--- a/symbian4/mw/inputmethods/package_definition.xml	Wed Jun 30 15:46:53 2010 +0100
+++ b/symbian4/mw/inputmethods/package_definition.xml	Wed Jun 30 15:58:34 2010 +0100
@@ -2,13 +2,6 @@
 <SystemDefinition schema="3.0.0">
  <package id="inputmethods" name="Input Methods" levels="plugin engine framework api">
   <collection id="inputmethods_pub" name="Input Methods Public Interfaces" level="api">
-   <component id="ptiengine_iti_api" name="PTI Engine API" class="api" filter="s60">
-    <meta rel="Api" href="inputmethods_pub/ptiengine_iti_api/ptiengine_api.metaxml"/>
-    <meta rel="config">
-     <defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
-    </meta>
-    <unit bldFile="inputmethods_pub/ptiengine_iti_api/group"/>
-   </component>
    <component id="optical_character_recognition_api" name="Optical Character Recognition API" class="api" filter="s60">
     <meta rel="Api" href="inputmethods_pub/optical_character_recognition_api/optical_character_recognition_api.metaxml"/>
     <unit bldFile="inputmethods_pub/optical_character_recognition_api/group"/>
@@ -38,13 +31,6 @@
     </meta>
     <unit bldFile="inputmethods_plat/aknfep_status_api/group"/>
    </component>
-   <component id="ptiengine_key_definations_api" name="PTI Engine Key Definitions API" class="api" filter="s60">
-    <meta rel="Api" href="inputmethods_plat/ptiengine_key_definations_api/ptiengine_key_definations_api.metaxml"/>
-    <meta rel="config">
-     <defined condition="RD_INTELLIGENT_TEXT_INPUT"/>
-    </meta>
-    <unit bldFile="inputmethods_plat/ptiengine_key_definations_api/group"/>
-   </component>
    <component id="aknfep_definitions_api" name="Avkon FEP Definitions API" class="api" filter="s60">
     <meta rel="Api" href="inputmethods_plat/aknfep_definitions_api/aknfep_definitions_api.metaxml"/>
     <unit bldFile="inputmethods_plat/aknfep_definitions_api/group"/>
@@ -78,7 +64,7 @@
   </collection>
   <collection id="fep" name="FEP" level="engine">
    <component id="aknfep" filter="s60" name="Avkon FEP" class="plugin">
-    <unit bldFile="fep/aknfep/group"/>
+    <unit bldFile="fepstub/group"/>
    </component>
    <component id="frontendprocessor" name="Front End Processor" purpose="mandatory">
     <unit bldFile="fep/frontendprocessor/group" mrp="fep/frontendprocessor/group/app-framework_fepbase.mrp"/>
diff -r e2b817b08134 -r dc8c3f5ca92a symbian4/mw/ipappsrv/package_definition.xml
--- a/symbian4/mw/ipappsrv/package_definition.xml	Wed Jun 30 15:46:53 2010 +0100
+++ b/symbian4/mw/ipappsrv/package_definition.xml	Wed Jun 30 15:58:34 2010 +0100
@@ -64,9 +64,6 @@
     <!-- remove the #includes from here and rename as xxx ROM or move iby/sis files into another component-->
     <unit mrp="group"/>
    </component>
-   <component id="ipappsrv_metadata" name="IP App Services Metadata" class="config" introduced="^2" purpose="development" target="desktop">
-    <unit mrp="ipappsrv_info/ipappsrv_metadata/ipappsrv_metadata.mrp"/>
-   </component>
   </collection>
  </package>
 </SystemDefinition>
diff -r e2b817b08134 -r dc8c3f5ca92a symbian4/mw/ipconnmgmt/package_definition.xml
--- a/symbian4/mw/ipconnmgmt/package_definition.xml	Wed Jun 30 15:46:53 2010 +0100
+++ b/symbian4/mw/ipconnmgmt/package_definition.xml	Wed Jun 30 15:58:34 2010 +0100
@@ -34,10 +34,6 @@
     <meta rel="Api" href="ipcm_plat/extended_connection_settings_api/extended_connection_settings_api.metaxml"/>
     <unit bldFile="ipcm_plat/extended_connection_settings_api/group"/>
    </component>
-   <component id="mpm_default_connection_api" name="MPM Default Connection API" class="api" filter="s60">
-    <meta rel="Api" href="ipcm_plat/mpm_default_connection_api/mpm_default_connection_api.metaxml"/>
-    <unit bldFile="ipcm_plat/mpm_default_connection_api/group"/>
-   </component>
    <component id="pdpcontextmanager2_reset_factory_settings_api" name="PDP Context Manager 2 Reset Factory Settings API" class="api" filter="s60">
     <meta rel="Api" href="ipcm_plat/pdpcontextmanager2_reset_factory_settings_api/pdpcontextmanager2_reset_factory_settings_api.metaxml"/>
     <unit bldFile="ipcm_plat/pdpcontextmanager2_reset_factory_settings_api/group"/>
@@ -49,6 +45,9 @@
    <component id="mpm_connect_screen_api" name="MPM Connect Screen API" class="api" filter="s60">
     <unit bldFile="ipcm_plat/mpm_connect_screen_api/group"/>
    </component>
+   <component id="flextimer_api" name="Flex Timer API" class="api" filter="s60" introduced="^4">
+    <unit bldFile="ipcm_plat/flextimer_api/group"/>
+   </component>
   </collection>
   <collection id="ipcm_pub" name="IP Connectivity Management Public Interfaces" level="api">
    <component id="connection_settings_api" name="Connection Settings API" class="api" filter="s60">
@@ -131,6 +130,11 @@
     <unit bldFile="connectionutilities/connectiondialogs/group"/>
    </component>
   </collection>
+  <collection id="keepalive" name="Keep Alive" level="server">
+   <component id="flextimer" filter="s60" name="Flex Timer" introduced="^4">
+    <unit bldFile="keepalive/flextimer/group"/>
+   </component>
+  </collection>
   <collection id="dbcreator" name="DB Creator" level="utils">
    <component id="commsdatcreator" filter="s60" name="Comms Database Creator" introduced="9.3">
     <unit bldFile="dbcreator/commsdatcreator/group"/>
diff -r e2b817b08134 -r dc8c3f5ca92a symbian4/mw/locationsrv/package_definition.xml
--- a/symbian4/mw/locationsrv/package_definition.xml	Wed Jun 30 15:46:53 2010 +0100
+++ b/symbian4/mw/locationsrv/package_definition.xml	Wed Jun 30 15:58:34 2010 +0100
@@ -98,7 +98,7 @@
    <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">
+   <component id="qtlocationsysui" filter="s60" name="Location System Qt UI">
     <unit bldFile="locationsystemui/locationsysui" qt:proFile="locsysui.pro"/>
    </component>
   </collection>
diff -r e2b817b08134 -r dc8c3f5ca92a symbian4/mw/mmmw/package_definition.xml
--- a/symbian4/mw/mmmw/package_definition.xml	Wed Jun 30 15:46:53 2010 +0100
+++ b/symbian4/mw/mmmw/package_definition.xml	Wed Jun 30 15:58:34 2010 +0100
@@ -2,13 +2,17 @@
 <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">
+      <meta rel="testbuild">
+       <group name="mmmw_tsrc_group"/>
+      </meta>
    <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="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"/>
+    <unit bldFile="mmmw_plat/enhanced_media_client_api/group" filter="!test"/>
+    <unit bldFile="mmmw_plat/enhanced_media_client_api/tsrc/Group" filter="test,api_test,pref_test,TA_MMMW"/>
    </component>
    <component id="stream_control_custom_command_api" name="Stream Control Custom Command API" class="api" filter="s60">
     <meta rel="Api" href="mmmw_plat/stream_control_custom_command_api/stream_control_custom_command_api.metaxml"/>
@@ -24,7 +28,8 @@
    </component>
    <component id="audio_metadata_reader_api" name="Audio MetaData Reader API" class="api" filter="s60">
     <meta rel="Api" href="mmmw_plat/audio_metadata_reader_api/audio_metadata_reader_api.metaxml"/>
-    <unit bldFile="mmmw_plat/audio_metadata_reader_api/group"/>
+    <unit bldFile="mmmw_plat/audio_metadata_reader_api/group" filter="!test"/>
+    <unit bldFile="mmmw_plat/audio_metadata_reader_api/tsrc/Group" filter="test,api_test,pref_test,TA_MMMW"/>
    </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"/>
@@ -43,7 +48,8 @@
    </component>
    <component id="voip_audio_services_api" name="VoIP Audio Services" class="api" filter="s60">
     <meta rel="Api" href="mmmw_plat/voip_audio_services_api/voip_audio_services_api.metaxml"/>
-    <unit bldFile="mmmw_plat/voip_audio_services_api/group"/>
+    <unit bldFile="mmmw_plat/voip_audio_services_api/group" filter="!test"/>
+    <unit bldFile="mmmw_plat/voip_audio_services_api/tsrc/Group" filter="test,api_test,pref_test,TA_MMMW"/>
    </component>
    <component id="configuration_components_factory_api" name="Configuration Components Factory API" class="api" filter="s60">
     <meta rel="Api" href="mmmw_plat/configuration_components_factory_api/configuration_components_factory_api.metaxml"/>
@@ -51,7 +57,8 @@
    </component>
    <component id="audio_output_control_utility_api" name="Audio Output Control Utility API" class="api" filter="s60">
     <meta rel="Api" href="mmmw_plat/audio_output_control_utility_api/audio_output_control_utility_api.metaxml"/>
-    <unit bldFile="mmmw_plat/audio_output_control_utility_api/group"/>
+    <unit bldFile="mmmw_plat/audio_output_control_utility_api/group" filter="!test"/>
+    <unit bldFile="mmmw_plat/audio_output_control_utility_api/tsrc/Group" filter="test,api_test,pref_test,TA_MMMW"/>
    </component>
    <component id="audio_output_control_utility_proxy_api" name="Audio Output Control Utility Proxy API" class="api" filter="s60">
     <meta rel="Api" href="mmmw_plat/audio_output_control_utility_proxy_api/audio_output_control_utility_proxy_api.metaxml"/>
@@ -63,11 +70,13 @@
    </component>
    <component id="call_audio_control_api" name="Call AudioControl API" class="api" filter="s60">
     <meta rel="Api" href="mmmw_plat/call_audio_control_api/call_audiocontrol_api.metaxml"/>
-    <unit bldFile="mmmw_plat/call_audio_control_api/group"/>
+    <unit bldFile="mmmw_plat/call_audio_control_api/group" filter="!test"/>
+    <unit bldFile="mmmw_plat/call_audio_control_api/tsrc/Group" filter="test,api_test,pref_test,TA_MMMW"/>
    </component>
    <component id="radio_utilities_api" name="Radio Utilities API" class="api" filter="s60">
     <meta rel="Api" href="mmmw_plat/radio_utilities_api/radio_utilities_api.metaxml"/>
-    <unit bldFile="mmmw_plat/radio_utilities_api/group"/>
+    <unit bldFile="mmmw_plat/radio_utilities_api/group" filter="!test"/>
+    <unit bldFile="mmmw_plat/radio_utilities_api/tsrc/Group" filter="test,api_test,pref_test,TA_MMMW"/>
    </component>
    <component id="radio_preset_utilities_api" name="Radio Preset Utilities API" class="api" filter="s60">
     <meta rel="Api" href="mmmw_plat/radio_preset_utilities_api/radio_preset_utilities_api.metaxml"/>
@@ -79,15 +88,20 @@
    </component>
    <component id="thumbnail_engine_api" name="Thumbnail Engine API" class="api" filter="s60">
     <meta rel="Api" href="mmmw_plat/thumbnail_engine_api/thumbnail_engine_api.metaxml"/>
-    <unit bldFile="mmmw_plat/thumbnail_engine_api/group"/>
+    <unit bldFile="mmmw_plat/thumbnail_engine_api/group" filter="!test"/>
+    <unit bldFile="mmmw_plat/thumbnail_engine_api/tsrc/Group" filter="test,api_test,pref_test,TA_MMMW"/>
    </component>
    <component id="telephony_multimedia_service_api" name="Telephony Multimedia Service API" class="api" filter="s60">
+      <meta rel="testbuild">
+       <group name="mmmw_tms_tsrc_group"/>
+      </meta>
     <unit bldFile="mmmw_plat/telephony_multimedia_service_api/group" filter="!test"/>
-    <unit bldFile="mmmw_plat/telephony_multimedia_service_api/tsrc/group" filter="test,api_test"/>
+    <unit bldFile="mmmw_plat/telephony_multimedia_service_api/tsrc/group" filter="test,api_test,pref_test,TA_MMMW,TA_TMS"/>
    </component>
    <component id="openmax_al_api" name="OpenMAX AL API" class="api" filter="s60" introduced="^4">
       <meta rel="Api" href="mmmw_plat/openmax_al_api/openmax_al_api.metaxml"/>
-      <unit bldFile="mmmw_plat/openmax_al_api/group"/>
+      <unit bldFile="mmmw_plat/openmax_al_api/group" filter="!test"/>
+      <unit bldFile="mmmw_plat/openmax_al_api/tsrc/openmaxaltestmodule/group" filter="test,api_test,pref_test,TA_MMMW"/>
    </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"/>
@@ -95,6 +109,7 @@
    </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"/>
+      <unit bldFile="mmmw_plat/system_tone_service_api/tsrc/group" filter="test,api_test,pref_test,TA_MMMW"/>
    </component>
   </collection>
   <collection id="khronosfws" name="Khronos Frameworks" level="framework">
@@ -122,7 +137,10 @@
     <unit bldFile="mmfenh/profilesettingsmonitor/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"/>
+      <meta rel="testbuild">
+       <group name="advancedaudiocontroller_tsrc_group"/>
+      </meta>
+    <unit bldFile="mmfenh/advancedaudiocontroller/tsrc/advancedaudiocontrollertestmodule/group" filter="TA_ADVANCEDAUDIOCONTROLLER"/>
    </component>
   </collection>
   <collection id="mmserv" name="Multimedia Services" level="specific">
diff -r e2b817b08134 -r dc8c3f5ca92a symbian4/mw/phonesrv/package_definition.xml
--- a/symbian4/mw/phonesrv/package_definition.xml	Wed Jun 30 15:46:53 2010 +0100
+++ b/symbian4/mw/phonesrv/package_definition.xml	Wed Jun 30 15:58:34 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="phonesrv" name="Telephony and SIM Services" levels="plugin framework server generic specific">
+ <package id="phonesrv" name="Telephony and SIM Services" levels="utils framework server ui specific">
   <collection id="phonesrv_plat" name="Telephony and SIM Services Platform Interfaces" level="specific">
    <component id="string_parser_api" name="String Parser API" class="api" filter="s60">
     <meta rel="Api" href="phonesrv_plat/string_parser_api/string_parser_api.metaxml"/>
@@ -161,40 +161,122 @@
     <unit bldFile="phonesrv_plat/dialpad_api/group"/>
    </component>
   </collection>
+  <collection id="telutils" name="Telephony Utils" level="utils">
+   <component id="phoneparser" filter="s60" name="Phone Parser">
+    <unit bldFile="telutils/phoneparser/group"/>
+   </component>
+   <component id="telephonyservice" filter="s60" name="Telephony Service">
+    <unit bldFile="telutils/telephonyservice/group"/>
+   </component>
+   <component id="xqtelephonyservice" filter="s60" name="X Qt Telephony Service" introduced="^4">
+    <unit bldFile="telutils/xqtelephonyservice" qt:proFile="xqtelephonyservice.pro"/>
+   </component>
+   <component id="dialpad" filter="s60" name="Dial Pad" introduced="^4">
+    <unit bldFile="telutils/dialpad" qt:proFile="dialpad.pro"/>
+   </component>
+   <component id="keysequencerecognitionservice" filter="s60" name="Key Sequence Recognition Service" introduced="^4">
+    <unit bldFile="telutils/keysequencerecognitionservice" qt:proFile="keysequencerecognitionservice.pro"/>
+   </component>
+  </collection>
+  <collection id="cbs" name="Cellular Baseband Services" level="utils">
+   <component id="cbsserver" filter="s60" name="CBS Server">
+    <unit bldFile="cbs/cbsserver/group"/>
+   </component>
+  </collection>
   <collection id="cellular" name="Cellular" level="server">
    <component id="telephonysettings" filter="s60" name="Telephony Settings" purpose="development">
+    <unit bldFile="cellular/telephonysettings/group" filter="!test"/>
     <unit bldFile="cellular/telephonysettings/tsrc/public/basic/group" filter="test,api_test"/>
    </component>
+   <component id="psetwrapper" filter="s60" name="Provider Settings Wrapper" introduced="^4">
+	<!-- need to move to own component, not under sssettings -->
+    <unit bldFile="cellular/telephonysettings/xqbindings/psetwrapper" qt:proFile="psetwrapper.pro"/>
+   </component>
    <component id="sssettings" filter="s60" name="Supplementary Service Settings" purpose="development">
+    <unit bldFile="cellular/sssettings/group" filter="!test"/>
     <unit bldFile="cellular/SSSettings/tsrc/public/basic/group" filter="test,api_test"/>
    </component>
+   <component id="sssettingswrapper" filter="s60" name="Supplementary Service Settings Wrapper" introduced="^4">
+	<!-- need to move to own component, not under sssettings -->
+    <unit bldFile="cellular/sssettings/xqbindings/sssettingswrapper" qt:proFile="sssettingswrapper.pro"/>
+   </component>
    <component id="psetnotesui" filter="s60" name="Phone Settings Notes UI" purpose="development">
+    <unit bldFile="cellular/psetnotesui/group" filter="!test"/>
     <unit bldFile="cellular/PsetNotesUi/tsrc/public/basic/group" filter="test,api_test"/>
    </component>
+   <component id="servicerequest" filter="s60" name="Service Request">
+    <unit bldFile="cellular/servicerequest/group"/>
+   </component>
   </collection>
   <collection id="convergedcallengine" name="Converged Call Engine" level="framework">
-   <component id="cce" filter="s60" name="CCE"  purpose="development">
+   <component id="callprovider" filter="s60" name="Call Provider">
+    <unit bldFile="convergedcallengine/callprovider/group"/>
+   </component>
+   <component id="cce" filter="s60" name="CCE">
+    <unit bldFile="convergedcallengine/cce/group" filter="!test"/>
     <unit filter="test,api_test" bldFile="convergedcallengine/cce/tsrc/public/basic/group"/>
    </component>
-   <component id="spsettings" filter="s60" name="Service Provider Settings"  purpose="development">
+   <component id="spsettings" filter="s60" name="Service Provider Settings">
+    <unit bldFile="convergedcallengine/spsettings/group" filter="!test"/>
     <unit filter="test,api_test" bldFile="convergedcallengine/spsettings/tsrc/public/basic/group"/>
    </component>
+   <component id="cenrepdatabase" filter="s60" name="CCE Cenrep Database">
+    <unit bldFile="convergedcallengine/cenrepdatabase/group"/>
+   </component>
+   <component id="serviceselector" filter="s60" name="Service Selector">
+    <unit bldFile="convergedcallengine/serviceselector/group"/>
+   </component>
+  </collection>
+  <collection id="networkhandling" name="Network Handling" level="framework">
+   <component id="networkhandlingengine" filter="s60" name="Network Handling Engine">
+    <unit bldFile="networkhandling/networkhandlingengine/group"/>
+   </component>
   </collection>
   <collection id="phoneclientserver" name="Phone Client/Server" level="server">
-   <component id="aiwdialdata" filter="s60" name="AIW Dial Data"  purpose="development">
+   <component id="enpolicy" filter="s60" name="Emergency Number Policy">
+    <unit bldFile="phoneclientserver/enpolicy/group"/>
+   </component>
+   <component id="aiwdialdata" filter="s60" name="AIW Dial Data">
+    <unit bldFile="phoneclientserver/aiwdialdata/group" filter="!test"/>
     <unit filter="test,api_test" bldFile="phoneclientserver/aiwdialdata/tsrc/public/basic/group"/>
    </component>
-   <component id="dialutils" filter="s60" name="Dial Utils"  purpose="development">
+   <component id="dialutils" filter="s60" name="Dial Utils">
+    <unit bldFile="phoneclientserver/dialutils/group" filter="!test"/>
     <unit filter="test,api_test" bldFile="phoneclientserver/dialutils/tsrc/public/basic/group"/>
    </component>
-   <component id="phoneclient" filter="s60" name="Phone Client"  purpose="development">
+   <component id="phoneclient" filter="s60" name="Phone Client">
+    <unit bldFile="phoneclientserver/phoneclient/group" filter="!test"/>
     <unit filter="test,api_test" bldFile="phoneclientserver/phoneclient/tsrc/public/basic/group"/>
    </component>
+   <component id="phoneserver" filter="s60" name="Phone Server">
+    <unit bldFile="phoneclientserver/phoneserver/group"/>
+   </component>
+  </collection>
+  <collection id="phonecmdhandler" name="Phone Command Handler" level="generic">
+   <component id="phonecmdhnlr" filter="s60" name="Phone Command Handler">
+    <unit bldFile="phonecmdhandler/phonecmdhnlr/group"/>
+   </component>
   </collection>
-  <collection id="phonesrv_info" name="Phone Server Info" level="generic">
-    <component id="phonesrv_build" name="Phone Server Build" filter="s60">
-      <unit bldFile="."  qt:proFile="phonesrv.pro"/>
-     </component>
+  <collection id="satengine" name="SAT Engine" level="server">
+   <component id="satserver" filter="s60" name="SAT Server">
+    <unit bldFile="satengine/satserver/group"/>
+   </component>
+  </collection>
+  <collection id="satui" name="SAT UI" level="ui">
+   <component id="satshellcontroller" filter="s60" name="SAT Shell Controller">
+    <unit bldFile="satui/satshellcontroller/group"/>
+   </component>
+   <component id="satapp" filter="s60" name="SAT Application" introduced="^4">
+    <unit bldFile="satui/satapp" qt:proFile="satapp.pro"/>
+   </component>
+  </collection>
+  <collection id="vmbx" name="Voice Mailbox" level="ui">
+   <component id="vmbxcpplugin" filter="s60" name="Voice Mailbox CP Plugin" class="plugin" introduced="^4">
+    <unit bldFile="vmbx/vmbxcpplugin" qt:proFile="vmbxcpplugin.pro"/>
+   </component>
+   <component id="vmbxengine" filter="s60" name="Voice Mailbox Engine"  introduced="^4">
+    <unit bldFile="vmbx/vmbxengine" qt:proFile="vmbxengine.pro"/>
+   </component>
   </collection>
  </package>
 </SystemDefinition>
diff -r e2b817b08134 -r dc8c3f5ca92a symbian4/mw/qt/package_definition.xml
--- a/symbian4/mw/qt/package_definition.xml	Wed Jun 30 15:46:53 2010 +0100
+++ b/symbian4/mw/qt/package_definition.xml	Wed Jun 30 15:58:34 2010 +0100
@@ -14,20 +14,32 @@
             </component>
     </collection>
     <collection id="qtdemos" name="Qt Demos" level="app">
-            <component id="qtdemos_build" name="Qt Demos Build" introduced="^2" filter="test,qtdemos">
+            <component id="qtdemos_build" name="Qt Demos Build" introduced="^2" filter="test,qtdemos,build_as_app">
+			  <meta rel="testbuild">
+			   <group name="qtdemos"/>
+			  </meta>
                 <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="test,qtexamples">
+			  <meta rel="qtexamples">
+			   <group name="qtdemos"/>
+			  </meta>
+            <component id="qtexamples_build" name="Qt Examples Build" introduced="^2"  filter="test,qtexamples,build_as_app">
                 <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">
+            <component id="qttestsauto" name="Qt Automated Tests" introduced="^2"  filter="qttestsauto,test,build_as_app">
+				  <meta rel="qttestsauto">
+				   <group name="qtdemos"/>
+				  </meta>
                 <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">
+            <component id="qttestsbenchmarks" name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks,test,build_as_app">
+				  <meta rel="testbuild">
+				   <group name="qttestsbenchmarks"/>
+				  </meta>
                 <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>
diff -r e2b817b08134 -r dc8c3f5ca92a symbian4/mw/qtextensions/package_definition.xml
--- a/symbian4/mw/qtextensions/package_definition.xml	Wed Jun 30 15:46:53 2010 +0100
+++ b/symbian4/mw/qtextensions/package_definition.xml	Wed Jun 30 15:58:34 2010 +0100
@@ -7,7 +7,10 @@
      <component id="qtecomplugins_build" filter="qtecomplugins" name="Qt ECom Plugin"  purpose="development" introduced="^4" class="plugin">
       <unit bldFile="qtecomplugins" qt:proFile="qtecomplugins.pro" qt:qmakeArgs="-r"/>
      </component>
-    <component id="qtextensions_examples" filter="qtextensionsexamples" name="Qt ECom Plugin Examples"  purpose="development" introduced="^4">
+    <component id="qtextensions_examples" filter="qtextensionsexamples,build_as_app" name="Qt ECom Plugin Examples"  purpose="development" introduced="^4">
+      <meta rel="testbuild">
+       <group name="qtextensionsexamples"/>
+      </meta>
       <unit bldFile="qtecomplugins/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
      </component>
     </collection>
@@ -15,10 +18,16 @@
      <component id="qthighway_build" filter="qthighway" name="Qt Highway"  purpose="development" introduced="^4">
       <unit bldFile="qthighway" qt:proFile="qthighway.pro" qt:qmakeArgs="-r"/>
      </component>
-    <component id="qthighway_examples" filter="qtextensionsexamples" name="Qt Highway Examples"  purpose="development" introduced="^4">
+    <component id="qthighway_examples" filter="qtextensionsexamples,build_as_app" name="Qt Highway Examples"  purpose="development" introduced="^4">
+      <meta rel="testbuild">
+       <group name="qtextensionsexamples"/>
+      </meta>
       <unit bldFile="qthighway/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
      </component>
-     <component id="qthighwaytests" filter="test,qtextensionstests" name="Qt Highway Tests"  purpose="development" introduced="^4">
+     <component id="qthighwaytests" filter="test,qtextensionstests,build_as_app" name="Qt Highway Tests"  purpose="development" introduced="^4">
+      <meta rel="testbuild">
+       <group name="qtextensionstests"/>
+      </meta>
       <unit bldFile="qthighway/tests" qt:proFile="tests.pro" qt:qmakeArgs="-r"/>
      </component>
     </collection>
@@ -26,7 +35,10 @@
 	 <component id="qtmobileextensions_build" filter="qtextension" name="Qt Mobile Extensions"  purpose="development" introduced="^4">
       <unit bldFile="qtmobileextensions" qt:proFile="qtmobileextensions.pro" qt:qmakeArgs="-r"/>
      </component>
-    <component id="qtmobileextensions_examples" filter="qtextensionsexamples" name="Qt Mobile Extensions Examples"  purpose="development" introduced="^4">
+    <component id="qtmobileextensions_examples" filter="qtextensionsexamples,build_as_app" name="Qt Mobile Extensions Examples"  purpose="development" introduced="^4">
+      <meta rel="testbuild">
+       <group name="qtextensionsexamples"/>
+      </meta>
       <unit bldFile="qtmobileextensions/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
      </component>
     </collection>
@@ -34,10 +46,16 @@
 	 <component id="qtmobility_build" filter="qtmobility" name="Qt Mobility" purpose="development" introduced="^4">
       <unit bldFile="qtmobility" qt:proFile="qtmobility.pro" qt:qmakeArgs="-r"/>
      </component>
-    <component id="qtmobility_examples" filter="qtextensionsexamples" name="Qt Mobility Examples" purpose="development" introduced="^4">
+    <component id="qtmobility_examples" filter="qtextensionsexamples,build_as_app" name="Qt Mobility Examples" purpose="development" introduced="^4">
+      <meta rel="testbuild">
+       <group name="qtextensionsexamples"/>
+      </meta>
       <unit bldFile="qtmobility/examples" qt:proFile="examples.pro" qt:qmakeArgs="-r"/>
      </component>
-     <component id="qtmobilitytests" filter="test,qtextensionstests" name="Qt Extensions Tests"  purpose="development" introduced="^4">
+     <component id="qtmobilitytests" filter="test,qtextensionstests,build_as_app" name="Qt Extensions Tests"  purpose="development" introduced="^4">
+      <meta rel="testbuild">
+       <group name="qtextensionstests"/>
+      </meta>
       <unit bldFile="qtmobility/tests" qt:proFile="tests.pro" qt:qmakeArgs="-r"/>
      </component>
     </collection>
diff -r e2b817b08134 -r dc8c3f5ca92a symbian4/mw/remotemgmt/package_definition.xml
--- a/symbian4/mw/remotemgmt/package_definition.xml	Wed Jun 30 15:46:53 2010 +0100
+++ b/symbian4/mw/remotemgmt/package_definition.xml	Wed Jun 30 15:58:34 2010 +0100
@@ -134,6 +134,9 @@
     <meta rel="Api" href="remotemgmt_plat/ds_capability_mgmt_plugin_api/ds_capability_mgmt_plugin_api.metaxml"/>
     <unit bldFile="remotemgmt_plat/ds_capability_mgmt_plugin_api/group"/>
    </component>
+   <component id="devicemgmt_dialogs_api" name="Device Management Dialogs API" class="api" filter="s60" introduced="^4">
+    <unit bldFile="remotemgmt_plat/devicemgmt_dialogs_api/group"/>
+   </component>
   </collection>
   <collection id="policymanagement" name="Policy Management" level="generic">
    <component id="pmdmadapter" filter="s60" name="PM DM Adapter" class="plugin">
diff -r e2b817b08134 -r dc8c3f5ca92a symbian4/mw/srvdiscovery/package_definition.xml
--- a/symbian4/mw/srvdiscovery/package_definition.xml	Wed Jun 30 15:46:53 2010 +0100
+++ b/symbian4/mw/srvdiscovery/package_definition.xml	Wed Jun 30 15:58:34 2010 +0100
@@ -28,17 +28,17 @@
    </component>
   </collection>
   <collection id="servicediscoveryandcontrol" name="Service Discovery and Control" level="framework">
-   <component id="servicediscoveryfw" name="Service Discovery Framework" introduced="^3" purpose="optional">
+      <component id="servicediscoveryfw" name="Service Discovery Framework" introduced="^3" purpose="optional" filter="s60">
     <unit bldFile="servicediscoveryandcontrol/pnp/group" mrp="servicediscoveryandcontrol/pnp/group/servicediscoveryframework.mrp"/>
    </component>
   </collection>
   <collection id="upnp" name="UPnP" level="server">
-   <component id="upnpstack" name="UPnP Stack" introduced="^3" purpose="optional">
+      <component id="upnpstack" name="UPnP Stack" introduced="^3" purpose="optional" filter="s60">
     <unit bldFile="upnp/upnpstack/group"/>
    </component>
   </collection>
   <collection id="srvdiscovery_info" name="Service Discovery and Usage Info" level="specific">
-   <component id="srvdiscovery_metadata" name="Service Discovery and Usage Metadata" class="config" introduced="^2" purpose="development" target="desktop">
+      <component id="srvdiscovery_metadata" name="Service Discovery and Usage Metadata" class="config" introduced="^2" purpose="development" target="desktop" filter="s60">
     <unit mrp="srvdiscovery_info/srvdiscovery_metadata/srvdiscovery_metadata.mrp"/>
    </component>
   </collection>
diff -r e2b817b08134 -r dc8c3f5ca92a symbian4/mw/vpnclient/package_definition.xml
--- a/symbian4/mw/vpnclient/package_definition.xml	Wed Jun 30 15:46:53 2010 +0100
+++ b/symbian4/mw/vpnclient/package_definition.xml	Wed Jun 30 15:58:34 2010 +0100
@@ -7,122 +7,10 @@
         <unit bldFile="vpnc_plat/vpnapi/group"/>
       </component>
   </collection>
-  <collection id="vpnapiimpl" name="VPN API Implementation" level="api">
-   <component id="vpnapi_impl" filter="s60" name="VPN API">
+  <collection id="vpnapiimpl" name="VPN API Implementation" level="engine">
+   <component id="vpnapi_impl" filter="s60" name="VPN Implementation">
     <unit bldFile="vpnapiimpl/group"/>
    </component>
   </collection>
-  <collection id="vpnengine" name="VPN Engine" level="engine">
-   <!-- too many components in this collection.
-    		Probably best to group the binaries together into larger components
-    		or maybe split the collection into more reasonable groups  -->
-   <component id="eventmediatorapi" filter="s60" name="Event Mediator API">
-    <unit bldFile="vpnengine/eventmediatorapi/group"/>
-   </component>
-   <component id="eventviewer" filter="s60" name="Event Viewer">
-    <unit bldFile="vpnengine/eventviewer/group"/>
-   </component>
-   <component id="vpnins" filter="s60" name="VPN Installer">
-    <unit bldFile="vpnengine/vpnins/group"/>
-   </component>
-   <component id="ikepolparser" filter="s60" name="IKE Policy Parser">
-    <unit bldFile="vpnengine/ikepolparser/group"/>
-   </component>
-   <component id="utlbase64" filter="s60" name="Base64 Utilities">
-    <unit bldFile="vpnengine/utlbase64/group"/>
-   </component>
-   <component id="utlcrypto" filter="s60" name="Crypto Utilities">
-    <unit bldFile="vpnengine/utlcrypto/group"/>
-   </component>
-   <component id="utlxml" filter="s60" name="XML Utilities">
-    <unit bldFile="vpnengine/utlxml/group"/>
-   </component>
-   <component id="utlpkcs10" filter="s60" name="PKCS#10 Utilities">
-    <unit bldFile="vpnengine/utlpkcs10/group"/>
-   </component>
-   <component id="pkiserviceapi" filter="s60" name="PKI Service API">
-    <unit bldFile="vpnengine/pkiserviceapi/group"/>
-   </component>
-   <component id="ikecert" filter="s60" name="IKE Certificate Management">
-    <unit bldFile="vpnengine/ikecert/group"/>
-   </component>
-   <component id="kmdapi" filter="s60" name="Key Management Daemon API">
-    <unit bldFile="vpnengine/kmdapi/group"/>
-   </component>
-   <component id="kmdserver" filter="s60" name="Key Management Daemon Server">
-    <unit bldFile="vpnengine/kmdserver/group"/>
-   </component>
-   <component id="ikeutils" filter="s60" name="Internet Key Exchange Utils">
-    <unit bldFile="vpnengine/ikeutils/group"/>
-   </component>
-   <component id="ikev1lib" filter="s60" name="IKEv1 Library">
-    <unit bldFile="vpnengine/ikev1lib/group"/>
-   </component>
-   <component id="ikev2lib" filter="s60" name="IKEv2 Library">
-    <unit bldFile="vpnengine/ikev2lib/group"/>
-   </component>
-   <component id="vpnipsecpolparser" filter="s60" name="VPN IPsec Policy Parser">
-    <unit bldFile="vpnengine/vpnipsecpolparser/group"/>
-   </component>
-   <component id="sit" filter="s60" name="Socket Interaction Thread">
-    <unit bldFile="vpnengine/sit/group"/>
-   </component>
-   <component id="vpntcwrapper" filter="s60" name="VPN Terminal Control Wrapper">
-    <unit bldFile="vpnengine/vpntcwrapper/group"/>
-   </component>
-   <component id="eventmediator" filter="s60" name="Event Mediator">
-    <unit bldFile="vpnengine/eventmediator/group"/>
-   </component>
-   <component id="pkiservice" filter="s60" name="PKI Service">
-    <unit bldFile="vpnengine/pkiservice/group"/>
-   </component>
-   <component id="vpnconnagt" filter="s60" name="VPN Connection Agent">
-    <unit bldFile="vpnengine/vpnconnagt/group"/>
-   </component>
-   <component id="vpnmanager" filter="s60" name="VPN Manager">
-    <unit bldFile="vpnengine/vpnmanager/group"/>
-   </component>
-   <component id="vpncleaner" filter="s60" name="VPN Cleaner">
-    <unit bldFile="vpnengine/vpncleaner/group"/>
-   </component>
-   <component id="utlpkcs12" filter="s60" name="PKCS#12 Utilities">
-    <unit bldFile="vpnengine/utlpkcs12/group"/>
-   </component>
-   <component id="dmadengine" filter="s60" name="DM Adapter Engine">
-    <unit bldFile="vpnengine/dmadengine/group"/>
-   </component>
-   <component id="dmadipsecvpn" filter="s60" name="IPsec VPN DM Adapter" class="plugin">
-    <unit bldFile="vpnengine/dmadipsecvpn/group"/>
-   </component>
-   <component id="dmadpki" filter="s60" name="PKI DM Adapter" class="plugin">
-    <unit bldFile="vpnengine/dmadpki/group"/>
-   </component>
-   <component id="ikesocket" filter="s60" name="IKE Socket" introduced="^3">
-    <unit bldFile="vpnengine/ikesocket/group"/>
-   </component>
-  </collection>
-  <collection id="vpnui" name="VPN UI" level="ui">
-   <component id="vpnecomnotifier" filter="s60" name="VPN ECOM Notifier" class="plugin">
-    <unit bldFile="vpnui/vpnecomnotifier/group"/>
-   </component>
-   <component id="vpndialogmanager" filter="s60" name="VPN Dialog Manager">
-    <unit bldFile="vpnui/vpndialogmanager/group"/>
-   </component>
-   <component id="vpnpolins" filter="s60" name="VPN Policy Installer">
-    <unit bldFile="vpnui/vpnpolins/group"/>
-   </component>
-   <component id="vpnpolicyrecognizer" filter="s60" name="VPN Policy Recognizer" class="plugin">
-    <unit bldFile="vpnui/vpnpolicyrecognizer/group"/>
-   </component>
-  </collection>
-  <collection id="vpnclient_info" name="VPN Client Info" level="api">
-   <component id="vpnclient_help" filter="s60" name="VPN Client Help">
-    <unit bldFile="help/group"/>
-   </component>
-   <component id="vpnclient_build" filter="s60" name="VPN Client Build">
-    <!-- should split this up into the other components and remove this-->
-    <unit bldFile="group"/>
-   </component>
-  </collection>
  </package>
 </SystemDefinition>
diff -r e2b817b08134 -r dc8c3f5ca92a symbian4/mw/web/package_definition.xml
--- a/symbian4/mw/web/package_definition.xml	Wed Jun 30 15:46:53 2010 +0100
+++ b/symbian4/mw/web/package_definition.xml	Wed Jun 30 15:58:34 2010 +0100
@@ -165,9 +165,6 @@
    <component id="widgetregistry" filter="s60" name="Widget Registry">
     <unit bldFile="webengine/widgetregistry/group"/>
    </component>
-   <component id="wmlengine" filter="s60" name="WML Engine">
-    <unit bldFile="webengine/wmlengine/group"/>
-   </component>
    <component id="device" filter="s60" name="Device">
     <!-- this needs a more meaningful name -->
     <unit bldFile="webengine/device/group"/>
diff -r e2b817b08134 -r dc8c3f5ca92a symbian4/mw/webruntime/package_definition.xml
--- a/symbian4/mw/webruntime/package_definition.xml	Wed Jun 30 15:46:53 2010 +0100
+++ b/symbian4/mw/webruntime/package_definition.xml	Wed Jun 30 15:58:34 2010 +0100
@@ -4,7 +4,7 @@
 	<!-- 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+=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;"/>
+      <unit bldFile="." qt:proFile="cwrt.pro" qt:qmakeArgs="&quot;what+=qtsfw&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 e2b817b08134 -r dc8c3f5ca92a symbian4/mw/wirelessacc/package_definition.xml
--- a/symbian4/mw/wirelessacc/package_definition.xml	Wed Jun 30 15:46:53 2010 +0100
+++ b/symbian4/mw/wirelessacc/package_definition.xml	Wed Jun 30 15:58:34 2010 +0100
@@ -53,19 +53,22 @@
       <unit bldFile="wlanutilities" qt:proFile="wlanutilities.pro" qt:qmakeArgs="-r"/>
     </component>
    <component id="wlanqtutilities" filter="s60" name="WLAN Qt Utilities" introduced="^4">
-    <!--<unit bldFile="wlanutilities/wlanplugin/group" qt:proFile="wlanqtutilities.pro"/>-->
+    <!--<unit bldFile="wlanutilities/wlanplugin" qt:proFile="wlanqtutilities.pro"/>-->
+   </component>
+   <component id="wlanwizard " filter="s60" name="WLAN Wizard" introduced="^4">
+    <!--<unit bldFile="wlanutilities/wlanwizard" qt:proFile="wlanwizard.pro"/>-->
    </component>
    <component id="wlansniffer" filter="s60" name="WLAN Sniffer">
-    <!--<unit bldFile="wlanutilities/wlansettingsui/group" qt:proFile="wlansniffer.pro"/>-->
+    <!--<unit bldFile="wlanutilities/wlansettingsui" qt:proFile="wlansniffer.pro"/>-->
    </component>
    <component id="wlanentryplugin" filter="s60" name="WLAN Entry Plugin" class="plugin">
-    <!--<unit bldFile="wlanutilities/wlansniffer/group" qt:proFile="wlanentryplugin.pro"/>-->
+    <!--<unit bldFile="wlanutilities/wlansniffer" qt:proFile="wlanentryplugin.pro"/>-->
    </component>
    <component id="wlanindicatorplugin" filter="s60" name="WLAN Indicator Plugin" class="plugin">
-    <!--<unit bldFile="wlanutilities/wlanindicatorplugin/group" qt:proFile="wlanindicatorplugin.pro"/>-->
+    <!--<unit bldFile="wlanutilities/wlanindicatorplugin" qt:proFile="wlanindicatorplugin.pro"/>-->
    </component>
    <component id="cpwlansettingsplugin" filter="s60" name="WLAN Settings Control Panel Plugin" class="plugin"  introduced="^4">
-    <!--<unit bldFile="wlanutilities/cpwlansettingsplugin/group" qt:proFile="cpwlansettingsplugin.pro"/>-->
+    <!--<unit bldFile="wlanutilities/cpwlansettingsplugin" qt:proFile="cpwlansettingsplugin.pro"/>-->
    </component>
   </collection>
  </package>