# HG changeset patch
# User Bob Rosenberg <bob.rosenberg@nokia.com>
# Date 1271075849 -3600
# Node ID c154a6b30ef109576f5823f57f89d35b88c61db6
# Parent  5ae8e73210e8917ae15360622f8d274b181e6c44
Update for wk12 release

diff -r 5ae8e73210e8 -r c154a6b30ef1 symbian4/app/commonemail/package_definition.xml
--- a/symbian4/app/commonemail/package_definition.xml	Tue Apr 06 10:31:51 2010 +0100
+++ b/symbian4/app/commonemail/package_definition.xml	Mon Apr 12 13:37:29 2010 +0100
@@ -99,6 +99,9 @@
           <component name="nmclientapi" filter="s60" long-name="Nmail Client API" introduced="^4" class="placeholder">
             <!-- <unit bldFile="emailservices/nmclientapi" qt:proFile="nmclientapi.pro"/>-->
           </component>
+          <component name="nmailagent" filter="s60" long-name="Nmail Agent" introduced="^4" class="placeholder">
+            <!-- <unit bldFile="emailservices/nmailagent" qt:proFile="nmailagent.pro"/>-->
+          </component>
         </collection>
         <collection name="ipsservices" long-name="IMAP/POP/SMTP Services" level="service">
           <component name="ipssosplugin" filter="s60" long-name="IPS SOS Plugin" introduced="^2" plugin="Y" class="placeholder">
@@ -138,9 +141,15 @@
           <component name="nmailui" filter="s60" long-name="Nmail UI" introduced="^4" class="placeholder">
             <!-- <unit bldFile="emailuis/nmailui" qt:proFile="nmailui.pro"/> -->
           </component>
+          <component name="nmindicatorplugin" filter="s60" long-name="Nmail Indicator Plugin" introduced="^4" plugin="Y" class="placeholder">
+            <!-- <unit bldFile="emailuis/nmindicatorplugin" qt:proFile="nmindicatorplugin.pro"/> -->
+          </component>
           <component name="nmframeworkadapter" filter="s60" long-name="Nmail Framework Adapter" introduced="^4" plugin="Y" class="placeholder">
             <!-- <unit bldFile="emailuis/nmframeworkadapter" qt:proFile="nmframeworkadapter.pro"/> -->
           </component>
+          <component name="nmhswidget" filter="test,s60,widget_tools" long-name="Nmail Homescreen Widget">
+            <unit bldFile="/sf/app/commonemail/emailuis/nmhswidget/tsrc/nmhswidgettestapp"/>
+          </component>
         </collection>
         <collection name="commonemail_info" long-name="Email Apps Info" level="app">
           <component name="commonemail_build" long-name="Email Apps Build" introduced="^4">
diff -r 5ae8e73210e8 -r c154a6b30ef1 symbian4/app/commonemail/package_definition_3.0.xml
--- a/symbian4/app/commonemail/package_definition_3.0.xml	Tue Apr 06 10:31:51 2010 +0100
+++ b/symbian4/app/commonemail/package_definition_3.0.xml	Mon Apr 12 13:37:29 2010 +0100
@@ -23,6 +23,9 @@
       <component id="nmclientapi" filter="s60" name="Nmail Client API" introduced="^4">
        <!-- <unit bldFile="emailservices/nmclientapi" qt:proFile="nmclientapi.pro"/>-->
       </component>
+      <component id="nmailagent" filter="s60" name="Nmail Agent" introduced="^4">
+       <!-- <unit bldFile="emailservices/nmailagent" qt:proFile="nmailagent.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">
@@ -62,9 +65,15 @@
       <component id="nmailui" filter="s60" name="Nmail UI" introduced="^4">
         <!-- <unit bldFile="emailuis/nmailui" qt:proFile="nmailui.pro"/> -->
       </component>
+      <component id="nmindicatorplugin" filter="s60" name="Nmail Indicator Plugin" class="plugin" introduced="^4">
+        <!-- <unit bldFile="emailuis/nmindicatorplugin" qt:proFile="nmindicatorplugin.pro"/> -->
+      </component>
       <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">
+      <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 5ae8e73210e8 -r c154a6b30ef1 symbian4/app/firsttimeuse/package_definition.xml
--- a/symbian4/app/firsttimeuse/package_definition.xml	Tue Apr 06 10:31:51 2010 +0100
+++ b/symbian4/app/firsttimeuse/package_definition.xml	Mon Apr 12 13:37:29 2010 +0100
@@ -88,11 +88,6 @@
             <unit bldFile="/sf/app/firsttimeuse/."/>
           </component>
         </collection>
-        <collection name="firsttimeuse_test" long-name="First Time Use Test" level="support">
-          <component name="tsrc_build" long-name="Tsrc Build" filter="test,unit_test">
-            <unit bldFile="/sf/app/firsttimeuse/tsrc"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>
diff -r 5ae8e73210e8 -r c154a6b30ef1 symbian4/app/firsttimeuse/package_definition_3.0.xml
--- a/symbian4/app/firsttimeuse/package_definition_3.0.xml	Tue Apr 06 10:31:51 2010 +0100
+++ b/symbian4/app/firsttimeuse/package_definition_3.0.xml	Mon Apr 12 13:37:29 2010 +0100
@@ -13,10 +13,5 @@
       <unit bldFile="." qt:proFile="ftu.pro" qt:qmakeArgs="-r -config rom"/>
      </component>
     </collection>
-    <collection id="firsttimeuse_test" name="First Time Use Test" level="support">
-    <component id="tsrc_build" name="Tsrc Build" filter="test,unit_test">
-      <unit bldFile="tsrc" qt:proFile="tsrc.pro" qt:qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
-     </component>
-    </collection>
    </package>
 </SystemDefinition>
diff -r 5ae8e73210e8 -r c154a6b30ef1 symbian4/app/organizer/package_definition.xml
--- a/symbian4/app/organizer/package_definition.xml	Tue Apr 06 10:31:51 2010 +0100
+++ b/symbian4/app/organizer/package_definition.xml	Mon Apr 12 13:37:29 2010 +0100
@@ -121,6 +121,9 @@
           <component name="caleneditor" filter="s60" long-name="Calendar Editor" introduced="^4">
             <unit bldFile="/sf/app/organizer/calendarui/caleneditor"/>
           </component>
+          <component name="agendaeventviewer" filter="s60" long-name="Agenda Event Viewer" introduced="^4">
+            <unit bldFile="/sf/app/organizer/calendarui/agendaeventviewer"/>
+          </component>
           <component name="globaldata" filter="s60" long-name="Calendar Global Data">
             <unit bldFile="/sf/app/organizer/calendarui/globaldata"/>
           </component>
@@ -133,9 +136,6 @@
           <component name="customisationmanager" filter="s60" long-name="Calendar Customisation Manager">
             <unit bldFile="/sf/app/organizer/calendarui/customisationmanager"/>
           </component>
-          <component name="agendaeventviewer" filter="s60" long-name="Agenda Event Viewer" introduced="^4">
-            <unit bldFile="/sf/app/organizer/calendarui/agendaeventviewer"/>
-          </component>
           <component name="views" filter="s60" long-name="Calendar Views">
             <unit bldFile="/sf/app/organizer/calendarui/views"/>
           </component>
diff -r 5ae8e73210e8 -r c154a6b30ef1 symbian4/app/organizer/package_definition_3.0.xml
--- a/symbian4/app/organizer/package_definition_3.0.xml	Tue Apr 06 10:31:51 2010 +0100
+++ b/symbian4/app/organizer/package_definition_3.0.xml	Mon Apr 12 13:37:29 2010 +0100
@@ -58,6 +58,9 @@
    <component id="caleneditor" filter="s60" name="Calendar Editor" introduced="^4">
     <unit bldFile="calendarui/caleneditor" qt:proFile="caleneditor.pro"/>
    </component>
+   <component id="agendaeventviewer" filter="s60" name="Agenda Event Viewer" introduced="^4" >
+    <unit bldFile="calendarui/agendaeventviewer" qt:proFile="agendaeventviewer.pro"/>
+   </component>
    <component id="globaldata" filter="s60" name="Calendar Global Data">
     <unit bldFile="calendarui/globaldata" qt:proFile="globaldata.pro"/>
    </component>
@@ -70,9 +73,6 @@
    <component id="customisationmanager" filter="s60" name="Calendar Customisation Manager">
     <unit bldFile="calendarui/customisationmanager" qt:proFile="customisationmanager.pro"/>
    </component>
-   <component id="agendaeventviewer" filter="s60" name="Agenda Event Viewer" introduced="^4" >
-    <unit bldFile="calendarui/agendaeventviewer" qt:proFile="agendaeventviewer.pro"/>
-   </component>
    <component id="views" filter="s60" name="Calendar Views">
     <unit bldFile="calendarui/views" qt:proFile="views.pro"/>
    </component>
diff -r 5ae8e73210e8 -r c154a6b30ef1 symbian4/mw/appinstall/package_definition.xml
--- a/symbian4/mw/appinstall/package_definition.xml	Tue Apr 06 10:31:51 2010 +0100
+++ b/symbian4/mw/appinstall/package_definition.xml	Mon Apr 12 13:37:29 2010 +0100
@@ -127,9 +127,6 @@
           </component>
         </collection>
         <collection name="appinstaller" long-name="Application Installer" level="generic">
-          <component name="appmngr2" filter="s60" long-name="Application Manager 2" introduced="^2">
-            <unit bldFile="/sf/mw/appinstall/appinstaller/appmngr2/group"/>
-          </component>
           <component name="appinstui" filter="s60" long-name="Application Installer UI" introduced="^2">
             <unit bldFile="/sf/mw/appinstall/appinstaller/appinstui/group"/>
           </component>
diff -r 5ae8e73210e8 -r c154a6b30ef1 symbian4/mw/appinstall/package_definition_3.0.xml
--- a/symbian4/mw/appinstall/package_definition_3.0.xml	Tue Apr 06 10:31:51 2010 +0100
+++ b/symbian4/mw/appinstall/package_definition_3.0.xml	Mon Apr 12 13:37:29 2010 +0100
@@ -61,9 +61,6 @@
       </component>
     </collection>
     <collection id="appinstaller" name="Application Installer" level="generic">
-      <component id="appmngr2" filter="s60" name="Application Manager 2" introduced="^2">
-        <unit bldFile="appinstaller/appmngr2/group"/>
-      </component>
       <component id="appinstui" filter="s60" name="Application Installer UI" introduced="^2">
         <unit bldFile="appinstaller/appinstui/group"/>
       </component>
diff -r 5ae8e73210e8 -r c154a6b30ef1 symbian4/mw/appsupport/package_definition.xml
--- a/symbian4/mw/appsupport/package_definition.xml	Tue Apr 06 10:31:51 2010 +0100
+++ b/symbian4/mw/appsupport/package_definition.xml	Mon Apr 12 13:37:29 2010 +0100
@@ -176,10 +176,10 @@
           <component name="system_application_plugin_callback_api" long-name="System Application Plug-in Callback API" filter="s60" class="api">
             <unit bldFile="/sf/mw/appsupport/appsupport_plat/system_application_plugin_callback_api/group"/>
           </component>
-          <component name="flash_mmi_service_interface_custom_api" long-name="Flash MMI Service Interface Custom API" filter="s60,!sf_build" class="api">
+          <component name="flash_mmi_service_interface_custom_api" long-name="Flash MMI Service Interface Custom API" filter="s60,!sf_build" introduced="^2" class="api">
             <unit bldFile="/sf/mw/appsupport/appsupport_plat/flash_mmi_service_interface_custom_api/group"/>
           </component>
-          <component name="flash_netscape_plugin_command_api" long-name="Flash Netscape Plugin Command API" filter="s60,!sf_build" class="api">
+          <component name="flash_netscape_plugin_command_api" long-name="Flash Netscape Plugin Command API" filter="s60,!sf_build" introduced="^2" class="api">
             <unit bldFile="/sf/mw/appsupport/appsupport_plat/flash_netscape_plugin_command_api/group"/>
           </component>
         </collection>
diff -r 5ae8e73210e8 -r c154a6b30ef1 symbian4/mw/appsupport/package_definition_3.0.xml
--- a/symbian4/mw/appsupport/package_definition_3.0.xml	Tue Apr 06 10:31:51 2010 +0100
+++ b/symbian4/mw/appsupport/package_definition_3.0.xml	Mon Apr 12 13:37:29 2010 +0100
@@ -132,10 +132,10 @@
     <meta rel="Api" href="appsupport_plat/system_application_plugin_callback_api/system_application_plugin_callback_api.metaxml"/>
     <unit bldFile="appsupport_plat/system_application_plugin_callback_api/group"/>
    </component>
-   <component id="flash_mmi_service_interface_custom_api" name="Flash MMI Service Interface Custom API" class="api" filter="s60,!sf_build">
+   <component id="flash_mmi_service_interface_custom_api" name="Flash MMI Service Interface Custom API" class="api" filter="s60,!sf_build"  introduced="^2">
       <unit bldFile="appsupport_plat/flash_mmi_service_interface_custom_api/group"/>
    </component>
-   <component id="flash_netscape_plugin_command_api" name="Flash Netscape Plugin Command API" class="api" filter="s60,!sf_build">
+   <component id="flash_netscape_plugin_command_api" name="Flash Netscape Plugin Command API" class="api" filter="s60,!sf_build" introduced="^2">
       <unit bldFile="appsupport_plat/flash_netscape_plugin_command_api/group"/>
    </component>
   </collection>
diff -r 5ae8e73210e8 -r c154a6b30ef1 symbian4/mw/btservices/package_definition.xml
--- a/symbian4/mw/btservices/package_definition.xml	Tue Apr 06 10:31:51 2010 +0100
+++ b/symbian4/mw/btservices/package_definition.xml	Mon Apr 12 13:37:29 2010 +0100
@@ -166,6 +166,14 @@
             <unit bldFile="/sf/mw/btservices/bluetoothappprofiles/avrcp" mrp="/sf/mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
           </component>
         </collection>
+        <collection name="atcommands" long-name="AT Commands" level="generic">
+          <component name="modematplugin" long-name="Modem AT Plugin" filter="s60" introduced="^4" plugin="Y">
+            <unit bldFile="/sf/mw/btservices/atcommands/modematplugin/group"/>
+          </component>
+          <component name="lccustomplugin" long-name="LC Custom Plugin" filter="s60" introduced="^4" plugin="Y">
+            <unit bldFile="/sf/mw/btservices/atcommands/lccustomplugin/group"/>
+          </component>
+        </collection>
         <collection name="btservices_info" long-name="BT Services Info" level="plugin">
           <component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
             <unit mrp="/sf/mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
diff -r 5ae8e73210e8 -r c154a6b30ef1 symbian4/mw/btservices/package_definition_3.0.xml
--- a/symbian4/mw/btservices/package_definition_3.0.xml	Tue Apr 06 10:31:51 2010 +0100
+++ b/symbian4/mw/btservices/package_definition_3.0.xml	Mon Apr 12 13:37:29 2010 +0100
@@ -105,6 +105,14 @@
     <unit bldFile="bluetoothappprofiles/avrcp" mrp="bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
    </component>
   </collection>
+  <collection id="atcommands" name="AT Commands" level="generic">
+   <component id="modematplugin" name="Modem AT Plugin" filter="s60" class="plugin" introduced="^4">
+    <unit bldFile="atcommands/modematplugin/group"/>
+   </component>
+   <component id="lccustomplugin" name="LC Custom Plugin" filter="s60" class="plugin" introduced="^4">
+    <unit bldFile="atcommands/lccustomplugin/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"/>
diff -r 5ae8e73210e8 -r c154a6b30ef1 symbian4/mw/classicui/package_definition.xml
--- a/symbian4/mw/classicui/package_definition.xml	Tue Apr 06 10:31:51 2010 +0100
+++ b/symbian4/mw/classicui/package_definition.xml	Mon Apr 12 13:37:29 2010 +0100
@@ -246,9 +246,6 @@
             <unit bldFile="/sf/mw/classicui/classicui_plat/extended_notes_api/group" filter="!test"/>
             <unit bldFile="/sf/mw/classicui/classicui_plat/extended_notes_api/tsrc/group" filter="test,api_test"/>
           </component>
-          <component name="screensaver_animation_plugin_definitions_api" long-name="Screensaver Animation Plugin Definitions API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/screensaver_animation_plugin_definitions_api/group"/>
-          </component>
           <component name="text_scroller_api" long-name="Text Scroller API" filter="s60" class="api">
             <unit bldFile="/sf/mw/classicui/classicui_plat/text_scroller_api/group" filter="!test"/>
             <unit bldFile="/sf/mw/classicui/classicui_plat/text_scroller_api/tsrc/group" filter="test,api_test"/>
@@ -257,9 +254,6 @@
             <unit bldFile="/sf/mw/classicui/classicui_plat/custom_cursors_api/group" filter="!test"/>
             <unit bldFile="/sf/mw/classicui/classicui_plat/custom_cursors_api/tsrc/group" filter="test,api_test"/>
           </component>
-          <component name="screensaver_settings_api" long-name="Screensaver Settings API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/screensaver_settings_api/group"/>
-          </component>
           <component name="global_window_priorities_api" long-name="Global Window Priorities API" filter="s60" class="api">
             <unit bldFile="/sf/mw/classicui/classicui_plat/global_window_priorities_api/group"/>
           </component>
@@ -291,9 +285,6 @@
             <unit bldFile="/sf/mw/classicui/classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
             <unit bldFile="/sf/mw/classicui/classicui_plat/phone_number_text_utilities_api/tsrc/group" filter="test,api_test"/>
           </component>
-          <component name="screensaver_runtime_api" long-name="Screensaver Runtime API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_plat/screensaver_runtime_api/group"/>
-          </component>
           <component name="extended_scroller_api" long-name="Extended Scroller API" filter="s60" class="api">
             <unit bldFile="/sf/mw/classicui/classicui_plat/extended_scroller_api/group"/>
           </component>
@@ -473,9 +464,8 @@
             <unit bldFile="/sf/mw/classicui/classicui_pub/notes_api/group" filter="!test"/>
             <unit bldFile="/sf/mw/classicui/classicui_pub/notes_api/tsrc/group" filter="test,api_test"/>
           </component>
-          <component name="screen_saver_api" long-name="Screen Saver API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/classicui/classicui_pub/screen_saver_api/group" filter="!test"/>
-            <unit bldFile="/sf/mw/classicui/classicui_pub/screen_saver_api/tsrc/group" filter="test,api_test"/>
+          <component name="screen_saver_api" long-name="Screen Saver API" filter="s60,test,api_test" class="api">
+            <unit bldFile="/sf/mw/classicui/classicui_pub/screen_saver_api/tsrc/group"/>
           </component>
           <component name="status_pane_api" long-name="Status Pane API" filter="s60" class="api">
             <unit bldFile="/sf/mw/classicui/classicui_pub/status_pane_api/group" filter="!test"/>
diff -r 5ae8e73210e8 -r c154a6b30ef1 symbian4/mw/classicui/package_definition_3.0.xml
--- a/symbian4/mw/classicui/package_definition_3.0.xml	Tue Apr 06 10:31:51 2010 +0100
+++ b/symbian4/mw/classicui/package_definition_3.0.xml	Mon Apr 12 13:37:29 2010 +0100
@@ -215,10 +215,6 @@
     <unit bldFile="classicui_plat/extended_notes_api/group" filter="!test"/>
     <unit bldFile="classicui_plat/extended_notes_api/tsrc/group" filter="test,api_test"/>
    </component>
-   <component id="screensaver_animation_plugin_definitions_api" name="Screensaver Animation Plugin Definitions API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/screensaver_animation_plugin_definitions_api/screensaver_animation_plugin_definitions_api.metaxml"/>
-    <unit bldFile="classicui_plat/screensaver_animation_plugin_definitions_api/group"/>
-   </component>
    <component id="text_scroller_api" name="Text Scroller API" class="api" filter="s60">
     <meta rel="Api" href="classicui_plat/text_scroller_api/text_scroller_api.metaxml"/>
     <unit bldFile="classicui_plat/text_scroller_api/group" filter="!test"/>
@@ -229,10 +225,6 @@
     <unit bldFile="classicui_plat/custom_cursors_api/group" filter="!test"/>
     <unit bldFile="classicui_plat/custom_cursors_api/tsrc/group" filter="test,api_test"/>
    </component>
-   <component id="screensaver_settings_api" name="Screensaver Settings API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/screensaver_settings_api/screensaver_settings_api.metaxml"/>
-    <unit bldFile="classicui_plat/screensaver_settings_api/group"/>
-   </component>
    <component id="global_window_priorities_api" name="Global Window Priorities API" class="api" filter="s60">
     <meta rel="Api" href="classicui_plat/global_window_priorities_api/global_window_priorities_api.metaxml"/>
     <unit bldFile="classicui_plat/global_window_priorities_api/group"/>
@@ -273,10 +265,6 @@
     <unit bldFile="classicui_plat/phone_number_text_utilities_api/group" filter="!test"/>
     <unit bldFile="classicui_plat/phone_number_text_utilities_api/tsrc/group" filter="test,api_test"/>
    </component>
-   <component id="screensaver_runtime_api" name="Screensaver Runtime API" class="api" filter="s60">
-    <meta rel="Api" href="classicui_plat/screensaver_runtime_api/screensaver_runtime_api.metaxml"/>
-    <unit bldFile="classicui_plat/screensaver_runtime_api/group"/>
-   </component>
    <component id="extended_scroller_api" name="Extended Scroller API" class="api" filter="s60">
     <meta rel="Api" href="classicui_plat/extended_scroller_api/extended_scroller_api.metaxml"/>
     <unit bldFile="classicui_plat/extended_scroller_api/group"/>
@@ -499,10 +487,12 @@
     <unit bldFile="classicui_pub/notes_api/group" filter="!test"/>
     <unit bldFile="classicui_pub/notes_api/tsrc/group" filter="test,api_test"/>
    </component>
-   <component id="screen_saver_api" name="Screen Saver API" class="api" filter="s60">
+   <component id="screen_saver_api" name="Screen Saver API" class="api" filter="s60,test,api_test">
     <meta rel="Api" href="classicui_pub/screen_saver_api/screen_saver_api.metaxml"/>
-    <unit bldFile="classicui_pub/screen_saver_api/group" filter="!test"/>
-    <unit bldFile="classicui_pub/screen_saver_api/tsrc/group" filter="test,api_test"/>
+    <meta rel="testbuild">
+       <group name="classicui_pub_api_tests"/>
+    </meta>
+    <unit bldFile="classicui_pub/screen_saver_api/tsrc/group"/>
    </component>
    <component id="status_pane_api" name="Status Pane API" class="api" filter="s60">
     <meta rel="Api" href="classicui_pub/status_pane_api/status_pane_api.metaxml"/>
diff -r 5ae8e73210e8 -r c154a6b30ef1 symbian4/mw/imghandling/package_definition.xml
--- a/symbian4/mw/imghandling/package_definition.xml	Tue Apr 06 10:31:51 2010 +0100
+++ b/symbian4/mw/imghandling/package_definition.xml	Mon Apr 12 13:37:29 2010 +0100
@@ -103,7 +103,8 @@
             <unit bldFile="/sf/mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
           </component>
           <component name="thumbnailmanager" filter="s60" long-name="Thumbnail Manager Qt" introduced="^4">
-            <unit bldFile="/sf/mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt"/>
+            <unit bldFile="/sf/mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt" filter="!test"/>
+            <unit bldFile="/sf/mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt/tsrc" filter="test,unit_test"/>
           </component>
         </collection>
       </block>
diff -r 5ae8e73210e8 -r c154a6b30ef1 symbian4/mw/imghandling/package_definition_3.0.xml
--- a/symbian4/mw/imghandling/package_definition_3.0.xml	Tue Apr 06 10:31:51 2010 +0100
+++ b/symbian4/mw/imghandling/package_definition_3.0.xml	Mon Apr 12 13:37:29 2010 +0100
@@ -30,7 +30,8 @@
     <unit bldFile="imagehandlingutilities/thumbnailmanager/group"/>
    </component>
    <component id="thumbnailmanager" filter="s60" name="Thumbnail Manager Qt" introduced="^4">
-    <unit bldFile="/mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt" qt:proFile="thumbnailmanagerqt.pro" qt:qmakeArgs="-r"/>
+    <unit bldFile="imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt" qt:proFile="thumbnailmanagerqt.pro" qt:qmakeArgs="-r" filter="!test"/>
+    <unit bldFile="imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt/tsrc" qt:proFile="test_qtnmwrapper.pro" filter="test,unit_test"/>
    </component>
   </collection>
  </package>
diff -r 5ae8e73210e8 -r c154a6b30ef1 symbian4/mw/qt/package_definition_3.0.xml
--- a/symbian4/mw/qt/package_definition_3.0.xml	Tue Apr 06 10:31:51 2010 +0100
+++ b/symbian4/mw/qt/package_definition_3.0.xml	Mon Apr 12 13:37:29 2010 +0100
@@ -10,7 +10,7 @@
     </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="&quot;CONFIG+=headerexport symbian_no_export_sqlite&quot; &quot;QMAKE_MOC=/epoc32/tools/qt/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/qt/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/qt/uic.exe&quot; -r"/>
+  		        <unit bldFile="." qt:proFile="projects.pro" qt:qmakeArgs="&quot;QMAKE_MOC=/epoc32/tools/qt/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/qt/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/qt/uic.exe&quot; -r"/>
             </component>
     </collection>
     <collection id="qtdemos" name="Qt Demos" level="app">
diff -r 5ae8e73210e8 -r c154a6b30ef1 symbian4/mw/shortlinkconn/package_definition.xml
--- a/symbian4/mw/shortlinkconn/package_definition.xml	Tue Apr 06 10:31:51 2010 +0100
+++ b/symbian4/mw/shortlinkconn/package_definition.xml	Mon Apr 12 13:37:29 2010 +0100
@@ -120,18 +120,9 @@
           <component name="dun" long-name="Dial Up Networking">
             <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/dun/group"/>
           </component>
-          <component name="lccustomplugin" long-name="LC Custom Plugins" plugin="Y">
-            <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/lccustomplugin/group"/>
-          </component>
           <component name="lcstylustap" long-name="LC Stylus Tap Plugins" plugin="Y">
             <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/lcstylustap/group"/>
           </component>
-          <component name="legacymodemplugin" long-name="Legacy Modem Plugin" plugin="Y">
-            <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/legacymodemplugin/group"/>
-          </component>
-          <component name="modematplugin" long-name="Modem AT Plugin" plugin="Y">
-            <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/modematplugin/group"/>
-          </component>
           <component name="generichid" long-name="Generic HID">
             <unit bldFile="/sf/mw/shortlinkconn/localconnectivityservice/generichid/group"/>
           </component>
diff -r 5ae8e73210e8 -r c154a6b30ef1 symbian4/mw/shortlinkconn/package_definition_3.0.xml
--- a/symbian4/mw/shortlinkconn/package_definition_3.0.xml	Tue Apr 06 10:31:51 2010 +0100
+++ b/symbian4/mw/shortlinkconn/package_definition_3.0.xml	Mon Apr 12 13:37:29 2010 +0100
@@ -49,18 +49,9 @@
    <component id="dun" name="Dial Up Networking">
     <unit bldFile="localconnectivityservice/dun/group"/>
    </component>
-   <component id="lccustomplugin" name="LC Custom Plugins" class="plugin">
-    <unit bldFile="localconnectivityservice/lccustomplugin/group"/>
-   </component>
    <component id="lcstylustap" name="LC Stylus Tap Plugins" class="plugin">
     <unit bldFile="localconnectivityservice/lcstylustap/group"/>
    </component>
-   <component id="legacymodemplugin" name="Legacy Modem Plugin" class="plugin">
-    <unit bldFile="localconnectivityservice/legacymodemplugin/group"/>
-   </component>
-   <component id="modematplugin" name="Modem AT Plugin" class="plugin">
-    <unit bldFile="localconnectivityservice/modematplugin/group"/>
-   </component>
    <component id="generichid" name="Generic HID">
     <unit bldFile="localconnectivityservice/generichid/group"/>
    </component>
diff -r 5ae8e73210e8 -r c154a6b30ef1 symbian4/mw/usbservices/package_definition.xml
--- a/symbian4/mw/usbservices/package_definition.xml	Tue Apr 06 10:31:51 2010 +0100
+++ b/symbian4/mw/usbservices/package_definition.xml	Mon Apr 12 13:37:29 2010 +0100
@@ -170,6 +170,11 @@
             <unit bldFile="/sf/mw/usbservices/usbuis/usbuiqt"/>
           </component>
         </collection>
+        <collection name="usbservices_test" long-name="USB Services Test" level="server">
+          <component name="usbservices_test_build" long-name="USB Services Test Build" filter="test,api_test,s60" introduced="^4">
+            <unit bldFile="/sf/mw/usbservices/tsrc/group"/>
+          </component>
+        </collection>
       </block>
     </layer>
   </systemModel>
diff -r 5ae8e73210e8 -r c154a6b30ef1 symbian4/mw/usbservices/package_definition_3.0.xml
--- a/symbian4/mw/usbservices/package_definition_3.0.xml	Tue Apr 06 10:31:51 2010 +0100
+++ b/symbian4/mw/usbservices/package_definition_3.0.xml	Mon Apr 12 13:37:29 2010 +0100
@@ -104,5 +104,10 @@
       <unit bldFile="usbuis/usbuiqt" qt:proFile="usbapplication.pro"/>
     </component>
   </collection>
+  <collection id="usbservices_test" name="USB Services Test" level="server">
+     <component id="usbservices_test_build" name="USB Services Test Build" filter="test,api_test,s60"  introduced="^4">
+      <unit bldFile="tsrc/group"/>
+     </component>
+  </collection>
  </package>
 </SystemDefinition>
diff -r 5ae8e73210e8 -r c154a6b30ef1 symbian4/os/mm/package_definition.xml
--- a/symbian4/os/mm/package_definition.xml	Tue Apr 06 10:31:51 2010 +0100
+++ b/symbian4/os/mm/package_definition.xml	Mon Apr 12 13:37:29 2010 +0100
@@ -339,7 +339,6 @@
       		Also move to a standard component location, not under effectspresets -->
             <unit bldFile="/sf/os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
             <unit bldFile="/sf/os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
-            <unit bldFile="/sf/os/mm/devsoundextensions/effectspresets/StereoWideningUtility/group" filter="!dfs_build"/>
           </component>
           <component name="telephonyaudiorouting" filter="s60" long-name="Telephony Audio Routing">
             <unit bldFile="/sf/os/mm/devsoundextensions/telephonyaudiorouting/group"/>
diff -r 5ae8e73210e8 -r c154a6b30ef1 symbian4/os/mm/package_definition_3.0.xml
--- a/symbian4/os/mm/package_definition_3.0.xml	Tue Apr 06 10:31:51 2010 +0100
+++ b/symbian4/os/mm/package_definition_3.0.xml	Mon Apr 12 13:37:29 2010 +0100
@@ -342,7 +342,6 @@
       		Also move to a standard component location, not under effectspresets -->
     <unit bldFile="devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
     <unit bldFile="devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
-    <unit bldFile="devsoundextensions/effectspresets/StereoWideningUtility/group" filter="!dfs_build"/>
    </component>
    <component id="telephonyaudiorouting" filter="s60" name="Telephony Audio Routing">
     <unit bldFile="devsoundextensions/telephonyaudiorouting/group"/>