# HG changeset patch
# User Bob Rosenberg <bob.rosenberg@nokia.com>
# Date 1274262107 -3600
# Node ID 5ab61259495b01415338b59fbfd3795351c1e8f2
# Parent  fcee787f22fe8450e8163e8aa6ebb226e78129f6
Include qt extensions in the 2.0.1 pkgdefs

diff -r fcee787f22fe -r 5ab61259495b symbian4/app/camera/package_definition.xml
--- a/symbian4/app/camera/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/app/camera/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -79,8 +79,8 @@
       <block name="camera" level="apps" long-name="Camera Apps">
         <collection name="camerauis" long-name="Camera UIs">
           <component name="cameraxui" filter="s60" long-name="CameraX UIs">
-            <unit bldFile="/sf/app/camera/camerauis/cameraxui" filter="!test"/>
-            <unit bldFile="/sf/app/camera/camerauis/cameraxui/cxengine/tsrc/unit" filter="test,unit_test"/>
+            <unit bldFile="/sf/app/camera/camerauis/cameraxui" filter="!test" proFile="camerax.pro"/>
+            <unit bldFile="/sf/app/camera/camerauis/cameraxui/cxengine/tsrc/unit" filter="test,unit_test" proFile="unit.pro"/>
           </component>
         </collection>
       </block>
diff -r fcee787f22fe -r 5ab61259495b symbian4/app/commonemail/package_definition.xml
--- a/symbian4/app/commonemail/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/app/commonemail/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -156,7 +156,7 @@
         <collection name="commonemail_info" long-name="Email Apps Info" level="app">
           <component name="commonemail_build" long-name="Email Apps Build" introduced="^4">
             <!-- split into actual components -->
-            <unit bldFile="/sf/app/commonemail/."/>
+            <unit bldFile="/sf/app/commonemail/." proFile="nmail.pro" qmakeArgs="-r"/>
           </component>
         </collection>
       </block>
diff -r fcee787f22fe -r 5ab61259495b symbian4/app/contacts/package_definition.xml
--- a/symbian4/app/contacts/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/app/contacts/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -95,39 +95,39 @@
           </component>
           <component name="phonebookui_build" filter="s60" long-name="Phonebook UI Build" introduced="^4">
             <!-- break up into components -->
-            <unit bldFile="/sf/app/contacts/phonebookui"/>
+            <unit bldFile="/sf/app/contacts/phonebookui" proFile="phonebookui.pro"/>
           </component>
         </collection>
         <collection name="qtcontactsmobility" long-name="Qt Contacts Mobility" level="support">
           <component name="qtcontactsmobility_build" filter="s60" long-name="Qt Contacts Mobility Build" introduced="^4" plugin="Y">
             <!-- not really a component, move down a dir? Break up into compnents? -->
-            <unit bldFile="/sf/app/contacts/qtcontactsmobility"/>
+            <unit bldFile="/sf/app/contacts/qtcontactsmobility" proFile="qtcontactsmobility.pro"/>
           </component>
         </collection>
         <collection name="phonebookengines" long-name="Phonebook Engines" level="engine">
           <component name="cntfindplugin" filter="s60" long-name="Contacts Find Plugin" introduced="^2" plugin="Y">
-            <unit bldFile="/sf/app/contacts/phonebookengines/cntfindplugin"/>
+            <unit bldFile="/sf/app/contacts/phonebookengines/cntfindplugin" proFile="cntfindplugin.pro"/>
           </component>
           <component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
             <unit bldFile="/sf/app/contacts/phonebookengines/contactsmodel/groupsql" mrp="/sf/app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
           </component>
           <component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
-            <unit bldFile="/sf/app/contacts/phonebookengines/cntsortplugin"/>
+            <unit bldFile="/sf/app/contacts/phonebookengines/cntsortplugin" proFile="cntsortplugin.pro"/>
           </component>
           <component name="mobcntmodel" filter="s60" long-name="Mobile Contacts Model" introduced="^4">
-            <unit bldFile="/sf/app/contacts/phonebookengines/mobcntmodel"/>
+            <unit bldFile="/sf/app/contacts/phonebookengines/mobcntmodel" proFile="mobcntmodel.pro"/>
           </component>
           <component name="mobcntactions" filter="s60" long-name="Mobile Contacts Actions" introduced="^4">
-            <unit bldFile="/sf/app/contacts/phonebookengines/mobcntactions"/>
+            <unit bldFile="/sf/app/contacts/phonebookengines/mobcntactions" proFile="mobcntactions.pro"/>
           </component>
           <component name="cntmaptileservice" filter="s60" long-name="Contacts Map Tile Service" introduced="^4">
-            <unit bldFile="/sf/app/contacts/phonebookengines/cntmaptileservice"/>
+            <unit bldFile="/sf/app/contacts/phonebookengines/cntmaptileservice" proFile="cntmaptileservice.pro"/>
           </component>
           <component name="simutility" filter="s60" long-name="SIM Utility" introduced="^4">
-            <unit bldFile="/sf/app/contacts/phonebookengines/simutility"/>
+            <unit bldFile="/sf/app/contacts/phonebookengines/simutility" proFile="simutility.pro"/>
           </component>
           <component name="cntimageutility" long-name="Contacts Image Utility" filter="s60" introduced="^4">
-            <unit bldFile="/sf/app/contacts/phonebookengines/cntimageutility"/>
+            <unit bldFile="/sf/app/contacts/phonebookengines/cntimageutility" proFile="cntimageutility.pro"/>
           </component>
         </collection>
         <collection name="pimprotocols" long-name="PIM Protocols" level="services">
diff -r fcee787f22fe -r 5ab61259495b symbian4/app/contentcontrol/package_definition.xml
--- a/symbian4/app/contentcontrol/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/app/contentcontrol/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -105,7 +105,7 @@
             <unit bldFile="/sf/app/contentcontrol/omads/omadsextensions/group"/>
           </component>
           <component name="omadsextensions_qt" filter="s60" long-name="OMA DS Qt Extensions" plugin="Y">
-            <unit bldFile="/sf/app/contentcontrol/omads/omadsextensions"/>
+            <unit bldFile="/sf/app/contentcontrol/omads/omadsextensions" proFile="omadsextensions.pro"/>
           </component>
         </collection>
       </block>
diff -r fcee787f22fe -r 5ab61259495b symbian4/app/devicecontrol/package_definition.xml
--- a/symbian4/app/devicecontrol/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/app/devicecontrol/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -82,19 +82,19 @@
             <unit bldFile="/sf/app/devicecontrol/deviceupdatesui/adapters/bld"/>
           </component>
           <component name="deviceupdates" long-name="Device Updates" filter="s60" introduced="^4">
-            <unit bldFile="/sf/app/devicecontrol/deviceupdatesui/deviceupdates"/>
+            <unit bldFile="/sf/app/devicecontrol/deviceupdatesui/deviceupdates" proFile="deviceupdates.pro"/>
           </component>
           <component name="deviceupdatesplugin" long-name="Device Updates Plugin" filter="s60" introduced="^4" plugin="Y">
-            <unit bldFile="/sf/app/devicecontrol/deviceupdatesui/deviceupdatesplugin"/>
+            <unit bldFile="/sf/app/devicecontrol/deviceupdatesui/deviceupdatesplugin" proFile="deviceupdatesplugin.pro"/>
           </component>
           <component name="deviceupdatesqtsp" long-name="Device Updates Qt Service Provider" filter="s60" introduced="^4">
-            <unit bldFile="/sf/app/devicecontrol/deviceupdatesui/deviceupdatesqtsp"/>
+            <unit bldFile="/sf/app/devicecontrol/deviceupdatesui/deviceupdatesqtsp" proFile="deviceupdatesqtsp.pro"/>
           </component>
           <component name="cpqtsp" long-name="Client Provisioning Qt Service Provider" filter="s60" introduced="^4">
-            <unit bldFile="/sf/app/devicecontrol/deviceupdatesui/cpqtsp"/>
+            <unit bldFile="/sf/app/devicecontrol/deviceupdatesui/cpqtsp" proFile="cpqtsp.pro"/>
           </component>
           <component name="devicemanagementnotifiersplugin" long-name="Device Management Notifiers Plugin" filter="s60" introduced="^4" plugin="Y">
-            <unit bldFile="/sf/app/devicecontrol/deviceupdatesui/devicemanagementnotifiersplugin"/>
+            <unit bldFile="/sf/app/devicecontrol/deviceupdatesui/devicemanagementnotifiersplugin" proFile="devicemanagementnotifiersplugin.pro"/>
           </component>
         </collection>
       </block>
diff -r fcee787f22fe -r 5ab61259495b symbian4/app/files/package_definition.xml
--- a/symbian4/app/files/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/app/files/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -84,7 +84,7 @@
           </component>
           <component name="filemanager_build" filter="s60" long-name="File Manager Build">
             <!-- break this up into components or move down a directory -->
-            <unit bldFile="/sf/app/files/filemanager"/>
+            <unit bldFile="/sf/app/files/filemanager" proFile="filemanager.pro"/>
           </component>
         </collection>
       </block>
diff -r fcee787f22fe -r 5ab61259495b symbian4/app/firsttimeuse/package_definition.xml
--- a/symbian4/app/firsttimeuse/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/app/firsttimeuse/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -85,7 +85,7 @@
         <collection name="runtimeproviders" long-name="Runtime Providers" level="support"/>
         <collection name="firsttimeuse_info" long-name="First Time Use Info" level="ui">
           <component name="firsttimeuse_build" long-name="First Time Use Build">
-            <unit bldFile="/sf/app/firsttimeuse/."/>
+            <unit bldFile="/sf/app/firsttimeuse/." proFile="ftu.pro" qmakeArgs="-r -config rom"/>
           </component>
         </collection>
       </block>
diff -r fcee787f22fe -r 5ab61259495b symbian4/app/helps/package_definition.xml
--- a/symbian4/app/helps/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/app/helps/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -80,7 +80,7 @@
         <collection name="userguide" long-name="User Guide" level="if">
           <!-- collection is really a component. Move down a directory -->
           <component name="userguide_build" long-name="User Guide Build" filter="s60" introduced="^4">
-            <unit bldFile="/sf/app/helps/userguide"/>
+            <unit bldFile="/sf/app/helps/userguide" proFile="Userguide.pro"/>
           </component>
         </collection>
         <collection name="symhelp" long-name="Symbian Help" level="eng">
diff -r fcee787f22fe -r 5ab61259495b symbian4/app/homescreen/package_definition.xml
--- a/symbian4/app/homescreen/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/app/homescreen/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -80,12 +80,12 @@
         <collection name="homescreen_info" long-name="Home Screen Info" level="support">
           <component name="homescreen_build" long-name="Homescreen Build">
             <!-- break this up properly into components -->
-            <unit bldFile="/sf/app/homescreen/."/>
+            <unit bldFile="/sf/app/homescreen/." proFile="homescreen.pro" qmakeArgs="-r -config rom"/>
           </component>
         </collection>
         <collection name="homescreen_test" long-name="Home Screen Test" level="support">
           <component name="tsrc_build" long-name="Tsrc Build" filter="test,unit_test">
-            <unit bldFile="/sf/app/homescreen/tsrc"/>
+            <unit bldFile="/sf/app/homescreen/tsrc" proFile="tsrc.pro" qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
           </component>
         </collection>
         <!-- fiill in details with broken up homescreen_build -->
diff -r fcee787f22fe -r 5ab61259495b symbian4/app/internetradio/package_definition.xml
--- a/symbian4/app/internetradio/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/app/internetradio/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -92,7 +92,7 @@
         <collection name="qtinternetradio" long-name="Qt Internet Radio">
           <component name="qtinternetradio_build" long-name="Qt Internet Radio Build">
             <!--  Move down a dir or break into components-->
-            <unit bldFile="/sf/app/internetradio/qtinternetradio"/>
+            <unit bldFile="/sf/app/internetradio/qtinternetradio" proFile="all.pro" qmakeArgs="-r -config rom"/>
           </component>
           <component name="qtinternetradio_internal" long-name="Qt Internet Radio Internal" filter="test" class="placeholder">
             <!-- appears to be missing. Remove? 
diff -r fcee787f22fe -r 5ab61259495b symbian4/app/jrt/package_definition.xml
--- a/symbian4/app/jrt/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/app/jrt/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -90,44 +90,44 @@
         </collection>
         <collection name="build_nativejava" long-name="Build Native Java">
           <component name="nativejava" long-name="Build Native Java" filter="s60" introduced="^4">
-            <unit bldFile="/sf/app/jrt/build/nativejava" filter="!sf_build"/>
-            <unit bldFile="/sf/app/jrt/build/nativejava" filter="sf_build"/>
+            <unit bldFile="/sf/app/jrt/build/nativejava" filter="!sf_build" proFile="nativejava.pro" qmakeArgs="-r"/>
+            <unit bldFile="/sf/app/jrt/build/nativejava" filter="sf_build" proFile="nativejava.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
           </component>
         </collection>
         <collection name="javacommons" long-name="Java Commons" level="generic">
           <component name="javacommons_build" filter="s60" long-name="JRT Build">
-            <unit bldFile="/sf/app/jrt/javacommons" filter="!sf_build"/>
-            <unit bldFile="/sf/app/jrt/javacommons" filter="sf_build"/>
+            <unit bldFile="/sf/app/jrt/javacommons" filter="!sf_build" proFile="javacommons.pro" qmakeArgs="-r"/>
+            <unit bldFile="/sf/app/jrt/javacommons" filter="sf_build" proFile="javacommons.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
           </component>
         </collection>
         <collection name="javaruntimes" long-name="Java Runtimes" level="rt">
           <component name="javaruntimes_build" filter="s60" long-name="JRT Build">
-            <unit bldFile="/sf/app/jrt/javaruntimes" filter="!sf_build"/>
-            <unit bldFile="/sf/app/jrt/javaruntimes" filter="sf_build"/>
+            <unit bldFile="/sf/app/jrt/javaruntimes" filter="!sf_build" proFile="javaruntimes.pro" qmakeArgs="-r"/>
+            <unit bldFile="/sf/app/jrt/javaruntimes" filter="sf_build" proFile="javaruntimes.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
           </component>
         </collection>
         <collection name="javauis" long-name="Java UIs" level="ui">
           <component name="javauis_build" filter="s60" long-name="JRT Build">
-            <unit bldFile="/sf/app/jrt/javauis" filter="!sf_build"/>
-            <unit bldFile="/sf/app/jrt/javauis" filter="sf_build"/>
+            <unit bldFile="/sf/app/jrt/javauis" filter="!sf_build" proFile="javauis.pro" qmakeArgs="-r"/>
+            <unit bldFile="/sf/app/jrt/javauis" filter="sf_build" proFile="javauis.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
           </component>
         </collection>
         <collection name="javamanager" level="generic">
           <component name="javamanager_build" filter="s60" long-name="JRT Build">
-            <unit bldFile="/sf/app/jrt/javamanager" filter="!sf_build"/>
-            <unit bldFile="/sf/app/jrt/javamanager" filter="sf_build"/>
+            <unit bldFile="/sf/app/jrt/javamanager" filter="!sf_build" proFile="javamanager.pro" qmakeArgs="-r"/>
+            <unit bldFile="/sf/app/jrt/javamanager" filter="sf_build" proFile="javamanager.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
           </component>
         </collection>
         <collection name="javatools" long-name="Java Tools" level="util">
           <component name="javatools_build" filter="s60" long-name="JRT Build">
-            <unit bldFile="/sf/app/jrt/javatools" filter="!sf_build"/>
-            <unit bldFile="/sf/app/jrt/javatools" filter="sf_build"/>
+            <unit bldFile="/sf/app/jrt/javatools" filter="!sf_build" proFile="javatools.pro" qmakeArgs="-r"/>
+            <unit bldFile="/sf/app/jrt/javatools" filter="sf_build" proFile="javatools.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
           </component>
         </collection>
         <collection name="javaextensions" long-name="Java Extensions" level="generic">
           <component name="javaextensions_build" filter="s60" long-name="JRT Build">
-            <unit bldFile="/sf/app/jrt/javaextensions" filter="!sf_build"/>
-            <unit bldFile="/sf/app/jrt/javaextensions" filter="sf_build"/>
+            <unit bldFile="/sf/app/jrt/javaextensions" filter="!sf_build" proFile="javaextensions.pro" qmakeArgs="-r"/>
+            <unit bldFile="/sf/app/jrt/javaextensions" filter="sf_build" proFile="javaextensions.pro" qmakeArgs="-r RD_JAVA_SF_BUILD=1"/>
           </component>
         </collection>
       </block>
diff -r fcee787f22fe -r 5ab61259495b symbian4/app/location/package_definition.xml
--- a/symbian4/app/location/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/app/location/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -79,19 +79,19 @@
       <block name="location" level="apps" long-name="Location Apps" levels="ui events loc api">
         <collection name="location_plat" long-name="Location Apps Platform Interfaces" level="api">
           <component name="location_picker_service_api" long-name="Location Picker Service API" introduced="^4" filter="s60" class="api">
-            <unit bldFile="/sf/app/location/location_plat"/>
+            <unit bldFile="/sf/app/location/location_plat" proFile="location_plat.pro"/>
           </component>
         </collection>
         <collection name="locationpickerservice" long-name="Location Picker Service" level="loc">
           <!--collection is really a component. Should move down a directory -->
           <component name="locationpickerservice_build" filter="s60" long-name="Location Picker Service Build" introduced="^4">
-            <unit bldFile="/sf/app/location/locationpickerservice"/>
+            <unit bldFile="/sf/app/location/locationpickerservice" proFile="locationpickerservice.pro"/>
           </component>
         </collection>
         <collection name="locationdataharvester" long-name="Location Data Harvester" level="events">
           <!--collection is really a component. Should move down a directory -->
           <component name="locationdataharvester_build" long-name="Location Data Harvester Build" filter="s60" introduced="^4">
-            <unit bldFile="/sf/app/location/locationdataharvester"/>
+            <unit bldFile="/sf/app/location/locationdataharvester" proFile="locationdataharvester.pro"/>
           </component>
         </collection>
       </block>
diff -r fcee787f22fe -r 5ab61259495b symbian4/app/messaging/package_definition.xml
--- a/symbian4/app/messaging/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/app/messaging/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -108,7 +108,7 @@
         <collection name="messagingappbase" long-name="Messaging App Base" level="base">
           <component name="messagingappbase_build" filter="s60" long-name="Messaging App Base Build" introduced="^4">
             <!-- break this up into the below components -->
-            <unit bldFile="/sf/app/messaging/messagingappbase"/>
+            <unit bldFile="/sf/app/messaging/messagingappbase" proFile="messagingappbase.pro" qmakeArgs="-r"/>
           </component>
           <component name="msgmedia" filter="s60" long-name="Message Media"/>
           <component name="smilparser" long-name="SMIL Parser" introduced="7.0s" purpose="optional">
@@ -163,34 +163,34 @@
           </component>
           <component name="mmsengine_build" filter="s60" long-name="MMS Engine Build">
             <!-- this should be broken up into the individual other components -->
-            <unit bldFile="/sf/app/messaging/mmsengine"/>
+            <unit bldFile="/sf/app/messaging/mmsengine" proFile="mmsengine.pro" qmakeArgs="-r"/>
           </component>
         </collection>
         <collection name="messagingapp" long-name="Messaging Application" level="app">
           <component name="messagingapp_build" filter="s60" long-name="MMS Engine Build">
             <!-- this should be broken up into the individual other components -->
-            <unit bldFile="/sf/app/messaging/messagingapp"/>
+            <unit bldFile="/sf/app/messaging/messagingapp" proFile="messagingapp.pro" qmakeArgs="-r"/>
           </component>
           <component name="msgutils" filter="s60" long-name="Messaging Utils" introduced="^4">
-            <unit bldFile="/sf/app/messaging/messagingapp/msgutils"/>
+            <unit bldFile="/sf/app/messaging/messagingapp/msgutils" proFile="msgutils.pro" qmakeArgs="-r"/>
           </component>
           <component name="msgappfw" filter="s60" long-name="Messaging Application Framework" introduced="^4">
-            <unit bldFile="/sf/app/messaging/messagingapp/msgappfw"/>
+            <unit bldFile="/sf/app/messaging/messagingapp/msgappfw" proFile="msgappfw.pro" qmakeArgs="-r"/>
           </component>
           <component name="msgsettings" filter="s60" long-name="Messaging Settings" introduced="^4">
-            <unit bldFile="/sf/app/messaging/messagingapp/msgsettings"/>
+            <unit bldFile="/sf/app/messaging/messagingapp/msgsettings" proFile="msgsettings.pro" qmakeArgs="-r"/>
           </component>
           <component name="msgnotifications" filter="s60" long-name="Messaging Notifications" introduced="^4">
-            <unit bldFile="/sf/app/messaging/messagingapp/msgnotifications"/>
+            <unit bldFile="/sf/app/messaging/messagingapp/msgnotifications" proFile="msgnotifications.pro" qmakeArgs="-r"/>
           </component>
           <component name="smartmessaging" filter="s60" long-name="Smart Messaging">
-            <unit bldFile="/sf/app/messaging/messagingapp/smartmessaging"/>
+            <unit bldFile="/sf/app/messaging/messagingapp/smartmessaging" proFile="smartmessaging.pro" qmakeArgs="-r"/>
           </component>
           <component name="shareui" filter="s60" long-name="Shared UI" introduced="^4">
-            <unit bldFile="/sf/app/messaging/messagingapp/shareui"/>
+            <unit bldFile="/sf/app/messaging/messagingapp/shareui" proFile="shareui.pro" qmakeArgs="-r"/>
           </component>
           <component name="msgui" filter="s60" long-name="Messaging UI" introduced="^4">
-            <unit bldFile="/sf/app/messaging/messagingapp/msgui"/>
+            <unit bldFile="/sf/app/messaging/messagingapp/msgui" proFile="msgui.pro" qmakeArgs="-r"/>
           </component>
         </collection>
         <collection name="email" long-name="Email" level="plugin">
diff -r fcee787f22fe -r 5ab61259495b symbian4/app/musicplayer/package_definition.xml
--- a/symbian4/app/musicplayer/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/app/musicplayer/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -130,7 +130,7 @@
         <collection name="musicplayer_info" long-name="Music Player Apps Info" level="app">
           <component name="musicplayer_build" filter="s60" long-name="Music Player Build">
             <!-- should brak up into individual components  -->
-            <unit bldFile="/sf/app/musicplayer/."/>
+            <unit bldFile="/sf/app/musicplayer/." proFile="qtmusicplayer.pro" qmakeArgs="-r -config rom"/>
           </component>
         </collection>
       </block>
diff -r fcee787f22fe -r 5ab61259495b symbian4/app/organizer/package_definition.xml
--- a/symbian4/app/organizer/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/app/organizer/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -80,13 +80,13 @@
         <collection name="organizer_pub" long-name="Organizer Application Suite Public Interfaces" level="app">
           <component name="calendar_interim_utils2_api" long-name="Calendar Interim Utils 2 API" filter="s60" class="api">
             <!-- move into own .pro file -->
-            <unit bldFile="/sf/app/organizer/organizer_pub"/>
+            <unit bldFile="/sf/app/organizer/organizer_pub" proFile="organizer_pub.pro"/>
           </component>
         </collection>
         <collection name="organizer_plat" long-name="Organizer Application Suite Platform Interfaces" level="app">
           <component name="organizer_plat_build" long-name="Organizer Application Suite Platform Interface Build" filter="s60" class="api">
             <!-- break up into individual .pro files -->
-            <unit bldFile="/sf/app/organizer/organizer_plat"/>
+            <unit bldFile="/sf/app/organizer/organizer_plat" proFile="organizer_plat.pro"/>
           </component>
           <component name="agenda_versit_2_api" long-name="Agenda Versit 2 API" filter="s60" class="api">
             <!-- <unit bldFile="organizer_plat/agenda_versit_2_api/group"/>-->
@@ -107,45 +107,45 @@
         <collection name="agendainterface" long-name="Agenda Interface" level="services">
           <!-- collection is really a component, should move down a directory -->
           <component name="agendainterface_build" filter="s60" long-name="Agenda Interface Build">
-            <unit bldFile="/sf/app/organizer/agendainterface"/>
+            <unit bldFile="/sf/app/organizer/agendainterface" proFile="agendainterface.pro"/>
           </component>
         </collection>
         <collection name="calendarui" long-name="Calendar UI" level="ui">
           <component name="commonutils" filter="s60" long-name="Calendar Common Utils">
-            <unit bldFile="/sf/app/organizer/calendarui/commonutils"/>
+            <unit bldFile="/sf/app/organizer/calendarui/commonutils" proFile="commonutils.pro"/>
           </component>
           <component name="calenlauncher" filter="s60" long-name="Calendar Launcher">
-            <unit bldFile="/sf/app/organizer/calendarui/calenlauncher"/>
+            <unit bldFile="/sf/app/organizer/calendarui/calenlauncher" proFile="calenlauncher.pro"/>
           </component>
           <component name="caleneditor" filter="s60" long-name="Calendar Editor" introduced="^4">
-            <unit bldFile="/sf/app/organizer/calendarui/caleneditor"/>
+            <unit bldFile="/sf/app/organizer/calendarui/caleneditor" proFile="caleneditor.pro"/>
           </component>
           <component name="agendaeventviewer" filter="s60" long-name="Agenda Event Viewer" introduced="^4">
-            <unit bldFile="/sf/app/organizer/calendarui/agendaeventviewer"/>
+            <unit bldFile="/sf/app/organizer/calendarui/agendaeventviewer" proFile="agendaeventviewer.pro"/>
           </component>
           <component name="globaldata" filter="s60" long-name="Calendar Global Data">
-            <unit bldFile="/sf/app/organizer/calendarui/globaldata"/>
+            <unit bldFile="/sf/app/organizer/calendarui/globaldata" proFile="globaldata.pro"/>
           </component>
           <component name="settings" filter="s60" long-name="Calendar Settings">
-            <unit bldFile="/sf/app/organizer/calendarui/settings"/>
+            <unit bldFile="/sf/app/organizer/calendarui/settings" proFile="settings.pro"/>
           </component>
           <component name="calenplugins" filter="s60" long-name="Calendar Plugins" introduced="^4" plugin="Y">
-            <unit bldFile="/sf/app/organizer/calendarui/calenplugins"/>
+            <unit bldFile="/sf/app/organizer/calendarui/calenplugins" proFile="calenplugins.pro"/>
           </component>
           <component name="customisationmanager" filter="s60" long-name="Calendar Customisation Manager">
-            <unit bldFile="/sf/app/organizer/calendarui/customisationmanager"/>
+            <unit bldFile="/sf/app/organizer/calendarui/customisationmanager" proFile="customisationmanager.pro"/>
           </component>
           <component name="views" filter="s60" long-name="Calendar Views">
-            <unit bldFile="/sf/app/organizer/calendarui/views"/>
+            <unit bldFile="/sf/app/organizer/calendarui/views" proFile="views.pro"/>
           </component>
           <component name="calendarui_controller" filter="s60" long-name="Calendar Controller">
-            <unit bldFile="/sf/app/organizer/calendarui/controller"/>
+            <unit bldFile="/sf/app/organizer/calendarui/controller" proFile="controller.pro"/>
           </component>
           <component name="calendarui_application" filter="s60" long-name="Calendar Application">
-            <unit bldFile="/sf/app/organizer/calendarui/application"/>
+            <unit bldFile="/sf/app/organizer/calendarui/application" proFile="application.pro"/>
           </component>
           <component name="regionalplugins" long-name="Regional Plugins" filter="s60" introduced="^4" plugin="Y">
-            <unit bldFile="/sf/app/organizer/calendarui/regionalplugins"/>
+            <unit bldFile="/sf/app/organizer/calendarui/regionalplugins" proFile="regionalplugins.pro"/>
           </component>
           <component name="caldav" filter="sf_build" long-name="CalDAV" introduced="^3" plugin="Y">
             <unit bldFile="/sf/app/organizer/calendarui/caldav/group"/>
@@ -153,10 +153,10 @@
         </collection>
         <collection name="notes" long-name="Notes" level="ui">
           <component name="noteseditor" filter="s60" long-name="Notes Editor" introduced="^4">
-            <unit bldFile="/sf/app/organizer/notes/notesui/noteseditor"/>
+            <unit bldFile="/sf/app/organizer/notes/notesui/noteseditor" proFile="noteseditor.pro"/>
           </component>
           <component name="notes_build" filter="s60" long-name="Notes Build" introduced="^4">
-            <unit bldFile="/sf/app/organizer/notes"/>
+            <unit bldFile="/sf/app/organizer/notes" proFile="notes.pro"/>
           </component>
         </collection>
         <collection name="calendarengines" long-name="Calendar Engines" level="engine">
@@ -192,7 +192,7 @@
           </component>
           <component name="clock_build" filter="s60" long-name="Clock Build">
             <!-- make exports into a component, or just move to one of the above components, then remove this and uncomment the above -->
-            <unit bldFile="/sf/app/organizer/clock"/>
+            <unit bldFile="/sf/app/organizer/clock" proFile="clock.pro"/>
           </component>
         </collection>
         <collection name="pimappservices" long-name="PIM Application Services" level="services">
@@ -220,7 +220,7 @@
         <collection name="alarmui" long-name="Alarm UI" level="app">
           <!-- collection is really a component, should move down a directory -->
           <component name="alarmui_build" filter="s60" long-name="Alarm UI Build">
-            <unit bldFile="/sf/app/organizer/alarmui"/>
+            <unit bldFile="/sf/app/organizer/alarmui" proFile="alarmui.pro"/>
           </component>
         </collection>
         <collection name="organizer_info" long-name="Organizer Application Suite Info" level="app">
diff -r fcee787f22fe -r 5ab61259495b symbian4/app/phone/package_definition.xml
--- a/symbian4/app/phone/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/app/phone/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -98,21 +98,21 @@
             <unit bldFile="/sf/app/phone/phoneapp/phonemediatorcenter/group"/>
           </component>
           <component name="phoneuiview2" filter="s60" long-name="Phone UI View">
-            <unit bldFile="/sf/app/phone/phoneapp/phoneuiview2"/>
+            <unit bldFile="/sf/app/phone/phoneapp/phoneuiview2" proFile="phoneuiview2.pro"/>
           </component>
           <component name="phoneuiqtviewadapter" filter="s60" long-name="Phone UI Qt View Adapter" introduced="^4" plugin="Y">
-            <unit bldFile="/sf/app/phone/phoneapp/phoneuiqtviewadapter"/>
+            <unit bldFile="/sf/app/phone/phoneapp/phoneuiqtviewadapter" proFile="phoneuiqtviewadapter.pro"/>
           </component>
           <component name="phonestringloader" filter="s60" long-name="Phone String Loader" introduced="^4">
-            <unit bldFile="/sf/app/phone/phoneapp/phonestringloader"/>
+            <unit bldFile="/sf/app/phone/phoneapp/phonestringloader" proFile="phonestringloader.pro"/>
           </component>
           <component name="phoneui2" filter="s60" long-name="Phone UI">
-            <unit bldFile="/sf/app/phone/phoneapp/phoneui2"/>
+            <unit bldFile="/sf/app/phone/phoneapp/phoneui2" proFile="phoneui2.pro"/>
           </component>
         </collection>
         <collection name="phoneengine" long-name="Phone Engine" level="engine">
           <component name="phonecntfinder2" filter="s60" long-name="Phone Contact Finder">
-            <unit bldFile="/sf/app/phone/phoneengine/phonecntfinder2"/>
+            <unit bldFile="/sf/app/phone/phoneengine/phonecntfinder2" proFile="phonecntfinder2.pro"/>
           </component>
           <component name="audiohandling" filter="s60" long-name="Phone Audio Handling">
             <unit bldFile="/sf/app/phone/phoneengine/audiohandling/group"/>
@@ -130,21 +130,21 @@
             <unit bldFile="/sf/app/phone/phoneengine/engineinfo/group"/>
           </component>
           <component name="phonemodel" filter="s60" long-name="Phone Model">
-            <unit bldFile="/sf/app/phone/phoneengine/phonemodel"/>
+            <unit bldFile="/sf/app/phone/phoneengine/phonemodel" proFile="phonemodel.pro"/>
           </component>
           <component name="servicehandling" filter="s60" long-name="Phone Service Handling">
             <unit bldFile="/sf/app/phone/phoneengine/servicehandling/group"/>
           </component>
           <component name="phoneservices" filter="s60" long-name="Phone Server" introduced="^4">
-            <unit bldFile="/sf/app/phone/phoneengine/phoneservices"/>
+            <unit bldFile="/sf/app/phone/phoneengine/phoneservices" proFile="phoneservices.pro"/>
           </component>
           <component name="parserrecognizer" filter="s60" long-name="Parser Recognizer" introduced="^4" plugin="Y">
-            <unit bldFile="/sf/app/phone/phoneengine/parserrecognizer"/>
+            <unit bldFile="/sf/app/phone/phoneengine/parserrecognizer" proFile="parserrecognizer.pro"/>
           </component>
         </collection>
         <collection name="phoneuis" long-name="Phone UIs" level="ui">
           <component name="bubblemanager2" filter="s60" long-name="Phone Bubble Manager">
-            <unit bldFile="/sf/app/phone/phoneuis/bubblemanager2"/>
+            <unit bldFile="/sf/app/phone/phoneuis/bubblemanager2" proFile="bubblemanager2.pro"/>
           </component>
           <component name="telephonydevicemode" filter="s60" long-name="Telephony Device Mode">
             <unit bldFile="/sf/app/phone/phoneuis/telephonydevicemode/group"/>
@@ -199,15 +199,15 @@
             <unit bldFile="/sf/app/phone/phoneplugins/csplugin/group"/>
           </component>
           <component name="hsdialerwidgetplugin" filter="s60" long-name="Home Screen Dialer Widget Plugin" introduced="^4" plugin="Y">
-            <unit bldFile="/sf/app/phone/phoneplugins/hsdialerwidgetplugin"/>
+            <unit bldFile="/sf/app/phone/phoneplugins/hsdialerwidgetplugin" proFile="hsdialerwidgetplugin.pro"/>
           </component>
           <component name="infowidgetplugin" filter="s60" long-name="Info Widget Plugin" introduced="^4" plugin="Y">
-            <unit bldFile="/sf/app/phone/phoneplugins/infowidgetplugin"/>
+            <unit bldFile="/sf/app/phone/phoneplugins/infowidgetplugin" proFile="infowidgetplugin.pro"/>
           </component>
         </collection>
         <collection name="phonesettings" long-name="Phone Settings" level="plugin">
           <component name="cpphonesettingsplugins" filter="s60" long-name="CP Phone Settings Plugins" introduced="^4" plugin="Y">
-            <unit bldFile="/sf/app/phone/phonesettings/cpphonesettingsplugins"/>
+            <unit bldFile="/sf/app/phone/phonesettings/cpphonesettingsplugins" proFile="cpphonesettingsplugins.pro"/>
           </component>
         </collection>
       </block>
diff -r fcee787f22fe -r 5ab61259495b symbian4/app/photos/package_definition.xml
--- a/symbian4/app/photos/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/app/photos/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -122,7 +122,7 @@
         <collection name="photos_info" long-name="Photos Info" level="support">
           <component name="photos_build" filter="s60" long-name="Photos Build" introduced="^4">
             <!--  split this up into the above components  -->
-            <unit bldFile="/sf/app/photos/."/>
+            <unit bldFile="/sf/app/photos/." proFile="photos.pro"/>
           </component>
         </collection>
       </block>
diff -r fcee787f22fe -r 5ab61259495b symbian4/app/radio/package_definition.xml
--- a/symbian4/app/radio/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/app/radio/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -90,19 +90,19 @@
         </collection>
         <collection name="radioapp" long-name="Radio App" level="ui">
           <component name="radioenginewrapper" filter="s60" long-name="Radio Engine Wrapper" introduced="^4">
-            <unit bldFile="/sf/app/radio/radioapp/radioenginewrapper"/>
+            <unit bldFile="/sf/app/radio/radioapp/radioenginewrapper" proFile="radioenginewrapper.pro"/>
           </component>
           <component name="radiopresetstorage" filter="s60" long-name="Radio Preset Storage" introduced="^4">
-            <unit bldFile="/sf/app/radio/radioapp/radiopresetstorage"/>
+            <unit bldFile="/sf/app/radio/radioapp/radiopresetstorage" proFile="radiopresetstorage.pro"/>
           </component>
           <component name="radiouiengine" filter="s60" long-name="Radio UI Engine" introduced="^4">
-            <unit bldFile="/sf/app/radio/radioapp/radiouiengine"/>
+            <unit bldFile="/sf/app/radio/radioapp/radiouiengine" proFile="radiouiengine.pro"/>
           </component>
           <component name="radiowidgets" filter="s60" long-name="Radio Widgets" introduced="^4">
-            <unit bldFile="/sf/app/radio/radioapp/radiowidgets"/>
+            <unit bldFile="/sf/app/radio/radioapp/radiowidgets" proFile="radiowidgets.pro"/>
           </component>
           <component name="radioapplication" filter="s60" long-name="Radio Application" introduced="^4">
-            <unit bldFile="/sf/app/radio/radioapp/radioapplication"/>
+            <unit bldFile="/sf/app/radio/radioapp/radioapplication" proFile="radioapplication.pro"/>
           </component>
           <component name="radio_rom" filter="s60" long-name="Radio ROM" introduced="^4">
             <unit bldFile="/sf/app/radio/rom"/>
diff -r fcee787f22fe -r 5ab61259495b symbian4/app/rndtools/package_definition.xml
--- a/symbian4/app/rndtools/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/app/rndtools/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -113,13 +113,13 @@
         <collection name="perfmon" long-name="Performance Monitor" level="test">
           <!-- collection is really a component. Should move down a directory -->
           <component name="perfmon_build" filter="s60" long-name="Performance Monitor Tool" purpose="development" class="tool">
-            <unit bldFile="/sf/app/rndtools/perfmon"/>
+            <unit bldFile="/sf/app/rndtools/perfmon" proFile="perfmon.pro"/>
           </component>
         </collection>
         <collection name="screengrabber" long-name="Screen Grabber" level="util">
           <!-- collection is really a component. Should move down a directory -->
           <component name="screengrabber_build" filter="s60" long-name="ScreenGrabber" purpose="development" class="tool">
-            <unit bldFile="/sf/app/rndtools/screengrabber"/>
+            <unit bldFile="/sf/app/rndtools/screengrabber" proFile="screengrabber.pro"/>
           </component>
         </collection>
         <collection name="stifui" long-name="STIF UI" level="generic">
diff -r fcee787f22fe -r 5ab61259495b symbian4/app/search/package_definition.xml
--- a/symbian4/app/search/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/app/search/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -84,7 +84,7 @@
         </collection>
         <collection name="searchui" long-name="Search UI">
           <component name="searchui_build" long-name="Search UI Build" introduced="^4">
-            <unit bldFile="/sf/app/search/searchui"/>
+            <unit bldFile="/sf/app/search/searchui" proFile="searchui.pro"/>
           </component>
         </collection>
       </block>
diff -r fcee787f22fe -r 5ab61259495b symbian4/app/settingsuis/package_definition.xml
--- a/symbian4/app/settingsuis/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/app/settingsuis/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -79,13 +79,13 @@
       <block name="settingsuis" level="services" long-name="Settings UIs" levels="plugin ui">
         <collection name="controlpanelplugins" long-name="Control Panel Plugins" level="plugin">
           <component name="themeplugin" filter="s60" long-name="Theme Plugin" introduced="^4">
-            <unit bldFile="/sf/app/settingsuis/controlpanelplugins/themeplugin"/>
+            <unit bldFile="/sf/app/settingsuis/controlpanelplugins/themeplugin" proFile="themeplugin.pro" qmakeArgs="-r -config rom"/>
           </component>
         </collection>
         <collection name="controlpanelui" long-name="Control Panel UI" level="ui">
           <!-- collection is really a component, move down a dir -->
           <component name="controlpanelui_build" filter="s60" long-name="Control Panel UI Build" introduced="^4">
-            <unit bldFile="/sf/app/settingsuis/controlpanelui"/>
+            <unit bldFile="/sf/app/settingsuis/controlpanelui" proFile="controlpanelui.pro" qmakeArgs="-r -config rom"/>
           </component>
         </collection>
       </block>
diff -r fcee787f22fe -r 5ab61259495b symbian4/app/videoplayer/package_definition.xml
--- a/symbian4/app/videoplayer/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/app/videoplayer/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -90,37 +90,37 @@
             <unit bldFile="/sf/app/videoplayer/videocollection/mpxmyvideoscollection/group"/>
           </component>
           <component name="videocollectionwrapper" filter="s60" long-name="Video Collection Wrapper" introduced="^4">
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper"/>
+            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper" proFile="videocollectionwrapper.pro" qmakeArgs="-r"/>
           </component>
           <component name="videocollectionwrapper_test" filter="test,qt_unit_test" long-name="Video Collection Wrapper Tests" introduced="^4">
             <!--Can only have one unit. Need to split into separate component or #include from a common file-->
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideocollectionclient"/>
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideocollectionlistener"/>
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideocollectionwrapper_p"/>
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideodatacontainer"/>
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideodeleteworker"/>
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideomodel"/>
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideomodel_p"/>
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideosortfilterproxymodel"/>
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideothumbnaildata"/>
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideothumbnaildata_p"/>
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideothumbnailfetcher"/>
+            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideocollectionclient" proFile="testvideocollectionclient.pro"/>
+            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideocollectionlistener" proFile="testvideocollectionlistener.pro"/>
+            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideocollectionwrapper_p" proFile="testvideocollectionwrapper_p.pro"/>
+            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideodatacontainer" proFile="testvideodatacontainer.pro"/>
+            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideodeleteworker" proFile="testvideodeleteworker.pro"/>
+            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideomodel" proFile="testvideomodel.pro"/>
+            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideomodel_p" proFile="testvideomodel_p.pro"/>
+            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideosortfilterproxymodel" proFile="testvideosortfilterproxymodel.pro"/>
+            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideothumbnaildata" proFile="testvideothumbnaildata.pro"/>
+            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideothumbnaildata_p" proFile="testvideothumbnaildata_p.pro"/>
+            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionwrapper/tsrc/testvideothumbnailfetcher" proFile="testvideothumbnailfetcher.pro"/>
           </component>
           <component name="videocollectionview" filter="s60" long-name="Video Collection View" introduced="^4">
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionview"/>
+            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionview" proFile="videocollectionview.pro" qmakeArgs="-r"/>
           </component>
           <component name="videocollectionview_test" filter="test,qt_unit_test" long-name="Video Collection View Tests">
             <!--Can only have one unit. Need to split into separate components or #include from a common file-->
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionview/tsrc/testcollectionview"/>
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionview/tsrc/testhintwidget"/>
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionview/tsrc/testlistview"/>
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionview/tsrc/testlistwidget"/>
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionview/tsrc/testvideocollectionuiloader"/>
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionview/tsrc/testvideocollectionviewutils"/>
-            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionview/tsrc/testvideolistselectiondialog"/>
+            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionview/tsrc/testcollectionview" proFile="testcollectionview.pro"/>
+            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionview/tsrc/testhintwidget" proFile="testhintwidget.pro"/>
+            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionview/tsrc/testlistview" proFile="testlistview.pro"/>
+            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionview/tsrc/testlistwidget" proFile="testlistwidget.pro"/>
+            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionview/tsrc/testvideocollectionuiloader" proFile="testvideocollectionuiloader.pro"/>
+            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionview/tsrc/testvideocollectionviewutils" proFile="testvideocollectionviewutils.pro"/>
+            <unit bldFile="/sf/app/videoplayer/videocollection/videocollectionview/tsrc/testvideolistselectiondialog" proFile="testvideolistselectiondialog.pro"/>
           </component>
           <component name="videofiledetailsview" filter="s60" long-name="Video File Details View" introduced="^4">
-            <unit bldFile="/sf/app/videoplayer/videocollection/videofiledetailsview"/>
+            <unit bldFile="/sf/app/videoplayer/videocollection/videofiledetailsview" proFile="videofiledetailsview.pro" qmakeArgs="-r"/>
           </component>
         </collection>
         <collection name="mediasettings" long-name="Media Settings" level="support">
@@ -131,18 +131,18 @@
         </collection>
         <collection name="videoplayerapp" long-name="Video Player App" level="apps">
           <component name="videoplayerengine" long-name="Video Player Engine" filter="s60" introduced="^4">
-            <unit bldFile="/sf/app/videoplayer/videoplayerapp/videoplayerengine"/>
+            <unit bldFile="/sf/app/videoplayer/videoplayerapp/videoplayerengine" proFile="videoplayerengine.pro" qmakeArgs="-r"/>
           </component>
           <component name="hbvideoplayer" filter="s60" long-name="HB Video Player" introduced="^4">
-            <unit bldFile="/sf/app/videoplayer/videoplayerapp/hbvideoplayer"/>
+            <unit bldFile="/sf/app/videoplayer/videoplayerapp/hbvideoplayer" proFile="hbvideoplayer.pro" qmakeArgs="-r"/>
           </component>
         </collection>
         <collection name="videoplayback" long-name="Video Playback Plugins" level="plugin">
           <component name="hbvideoplaybackview" filter="s60" long-name="HB Video Playback View" introduced="^4" plugin="Y">
-            <unit bldFile="/sf/app/videoplayer/videoplayback/hbvideoplaybackview"/>
+            <unit bldFile="/sf/app/videoplayer/videoplayback/hbvideoplaybackview" proFile="hbvideoplaybackview.pro" qmakeArgs="-r"/>
           </component>
           <component name="hbvideoplaybackviewplugin" filter="s60" long-name="HB Video Playback View Plugin" introduced="^4" plugin="Y">
-            <unit bldFile="/sf/app/videoplayer/videoplayback/hbvideoplaybackviewplugin"/>
+            <unit bldFile="/sf/app/videoplayer/videoplayback/hbvideoplaybackviewplugin" proFile="hbvideoplaybackviewplugin.pro" qmakeArgs="-r"/>
           </component>
           <component name="videohelix" long-name="Video Helix" filter="s60" introduced="^3" plugin="Y">
             <unit bldFile="/sf/app/videoplayer/videoplayback/videohelix/group"/>
diff -r fcee787f22fe -r 5ab61259495b symbian4/mw/appinstall/package_definition.xml
--- a/symbian4/mw/appinstall/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/mw/appinstall/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -194,7 +194,7 @@
         </collection>
         <collection name="appinstall_info" long-name="Application Installation Info" level="api">
           <component name="appinstall_qt" filter="s60,test,api_test" long-name="Application Installation Qt">
-            <unit bldFile="/sf/mw/appinstall/."/>
+            <unit bldFile="/sf/mw/appinstall/." proFile="appinstall.pro" qmakeArgs="-r"/>
           </component>
           <component name="appinstall_test" filter="s60,test,api_test" long-name="Application Installation Test" purpose="development">
             <unit bldFile="/sf/mw/appinstall/tsrc/group"/>
diff -r fcee787f22fe -r 5ab61259495b symbian4/mw/gsprofilesrv/package_definition.xml
--- a/symbian4/mw/gsprofilesrv/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/mw/gsprofilesrv/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -87,7 +87,7 @@
         </collection>
         <collection name="gsprofilesrv_plat" long-name="GS and Profiles Services Platform Interfaces" level="specific">
           <component name="ftuwizardmodel_api" long-name="FTU Wizard Model API" filter="bldfirst,s60" class="api">
-            <unit bldFile="/sf/mw/gsprofilesrv/gsprofilesrv_plat/ftuwizardmodel_api"/>
+            <unit bldFile="/sf/mw/gsprofilesrv/gsprofilesrv_plat/ftuwizardmodel_api" proFile="ftuwizardmodel_api.pro" qmakeArgs="-r -config rom"/>
           </component>
           <component name="profiles_engine_api" long-name="Profiles Engine API" filter="s60" class="api">
             <unit bldFile="/sf/mw/gsprofilesrv/gsprofilesrv_plat/profiles_engine_api/group"/>
@@ -118,18 +118,18 @@
         </collection>
         <collection name="ftuwizardmodel" long-name="FTU Wizard Model" level="generic">
           <component name="ftuwizardmodel_build" long-name="FTU Wizardmodel Build" filter="bldfirst">
-            <unit bldFile="/sf/mw/gsprofilesrv/ftuwizardmodel"/>
+            <unit bldFile="/sf/mw/gsprofilesrv/ftuwizardmodel" proFile="ftuwizardmodel.pro" qmakeArgs="-r -config rom"/>
           </component>
         </collection>
         <collection name="controlpanel" long-name="Control Panel" level="generic">
           <component name="controlpanel_test" long-name="Control Panel Test" filter="s60,test,qt_unit_test">
-            <unit bldFile="/sf/mw/gsprofilesrv/controlpanel/tsrc"/>
+            <unit bldFile="/sf/mw/gsprofilesrv/controlpanel/tsrc" proFile="tsrc.pro" qmakeArgs="-r"/>
           </component>
           <component name="controlpanel_rom" long-name="Control Panel ROM" filter="s60">
-            <unit bldFile="/sf/mw/gsprofilesrv/controlpanel/rom"/>
+            <unit bldFile="/sf/mw/gsprofilesrv/controlpanel/rom" proFile="cp_rom.pri" qmakeArgs="-r -config rom"/>
           </component>
           <component name="controlpanel_source" long-name="Control Panel Source" filter="s60">
-            <unit bldFile="/sf/mw/gsprofilesrv/controlpanel/src"/>
+            <unit bldFile="/sf/mw/gsprofilesrv/controlpanel/src" qmakeArgs="-r -config rom" proFile="src.pro"/>
           </component>
         </collection>
         <collection name="profilesservices" long-name="Profiles Services" level="server">
diff -r fcee787f22fe -r 5ab61259495b symbian4/mw/hb/package_definition.xml
--- a/symbian4/mw/hb/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/mw/hb/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -80,18 +80,18 @@
         <collection name="hb_info" long-name="Orbit Info" level="api">
           <component name="hb_build" long-name="Orbit Build" introduced="^4">
             <!-- should break this down into actual components -->
-            <unit bldFile="/sf/mw/hb/."/>
+            <unit bldFile="/sf/mw/hb/." proFile="hb.pro" qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
           </component>
         </collection>
         <collection name="hb_test" long-name="Orbit Test" level="test">
           <component name="hb_fute" filter="hb_fute_app" long-name="Fute" introduced="^4">
-            <unit bldFile="/sf/mw/hb/tsrc/fute"/>
+            <unit bldFile="/sf/mw/hb/tsrc/fute" proFile="fute.pro" qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
           </component>
           <component name="hb_unit" filter="test,hb_unit_test,unit_test" long-name="HB Unit Tests" introduced="^4">
-            <unit bldFile="/sf/mw/hb/tsrc/unit"/>
+            <unit bldFile="/sf/mw/hb/tsrc/unit" proFile="unit.pro" qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN"/>
           </component>
           <component name="hb_test_resources" filter="test,hb_test_resources" long-name="Orbit Test Resources" introduced="^4">
-            <unit bldFile="/sf/mw/hb/tsrc/resources"/>
+            <unit bldFile="/sf/mw/hb/tsrc/resources" qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN" proFile="resources.pro"/>
           </component>
         </collection>
       </block>
diff -r fcee787f22fe -r 5ab61259495b symbian4/mw/hgwidgets/package_definition.xml
--- a/symbian4/mw/hgwidgets/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/mw/hgwidgets/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -91,7 +91,7 @@
         </collection>
         <collection name="hgwidgets_info" long-name="HG Widgets Info" level="framework">
           <component name="hgwidgets_build" long-name="HG Widgets Build" introduced="^4">
-            <unit bldFile="/sf/mw/hgwidgets/."/>
+            <unit bldFile="/sf/mw/hgwidgets/." proFile="hgwidgets.pro"/>
           </component>
         </collection>
       </block>
diff -r fcee787f22fe -r 5ab61259495b symbian4/mw/homescreensrv/package_definition.xml
--- a/symbian4/mw/homescreensrv/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/mw/homescreensrv/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -79,29 +79,29 @@
       <block name="homescreensrv" level="specific" long-name="Home Screen Services" levels="plugin framework server generic specific">
         <collection name="appfoundation" long-name="App Foundation" level="generic">
           <component name="appfoundation_build" long-name="App Foundation Build" introduced="^4">
-            <unit bldFile="/sf/mw/homescreensrv/appfoundation"/>
+            <unit bldFile="/sf/mw/homescreensrv/appfoundation" qmakeArgs="-r" proFile="appfoundation.pro"/>
           </component>
         </collection>
         <collection name="hswidgetmodel" long-name="Home Screen Widget Model" level="framework">
           <component name="hswidgetmodel_build" long-name="Home Screen Widget Model Build" introduced="^4">
-            <unit bldFile="/sf/mw/homescreensrv/hswidgetmodel"/>
+            <unit bldFile="/sf/mw/homescreensrv/hswidgetmodel" qmakeArgs="-r" proFile="hswidgetmodel.pro"/>
           </component>
         </collection>
         <collection name="contentstorage" long-name="Content Storage" level="framework">
           <component name="cautils" long-name="Content Arsenal Utils" introduced="^4">
-            <unit bldFile="/sf/mw/homescreensrv/contentstorage/cautils"/>
+            <unit bldFile="/sf/mw/homescreensrv/contentstorage/cautils" qmakeArgs="-r" proFile="cautils.pro"/>
           </component>
           <component name="contentstorage_build" long-name="Content Storage Build" introduced="^4">
-            <unit bldFile="/sf/mw/homescreensrv/contentstorage/group"/>
+            <unit bldFile="/sf/mw/homescreensrv/contentstorage/group" qmakeArgs="-r" proFile="group.pro"/>
           </component>
           <component name="casrv/calocalizerscanner" long-name="Content Arsenal Server Localizer Scanner" introduced="^4">
-            <unit bldFile="/sf/mw/homescreensrv/contentstorage/casrv/calocalizerscanner"/>
+            <unit bldFile="/sf/mw/homescreensrv/contentstorage/casrv/calocalizerscanner" qmakeArgs="-r" proFile="calocalizerscanner.pro"/>
           </component>
           <component name="cahandler" long-name="Content Arsenal Handler" introduced="^4">
-            <unit bldFile="/sf/mw/homescreensrv/contentstorage/cahandler"/>
+            <unit bldFile="/sf/mw/homescreensrv/contentstorage/cahandler" qmakeArgs="-r" proFile="cahandler.pro"/>
           </component>
           <component name="caclient" long-name="Content Arsenal Client" introduced="^4">
-            <unit bldFile="/sf/mw/homescreensrv/contentstorage/caclient"/>
+            <unit bldFile="/sf/mw/homescreensrv/contentstorage/caclient" qmakeArgs="-r" proFile="caclient.pro"/>
           </component>
         </collection>
         <collection name="contentpublishingsrv" long-name="Content Publishing Service" level="server">
@@ -133,28 +133,28 @@
         </collection>
         <collection name="screensavermodel" long-name="Screensaver Model" level="specific">
           <component name="screensavermodel_build" long-name="Screensaver Model Build" introduced="^4">
-            <unit bldFile="/sf/mw/homescreensrv/screensavermodel"/>
+            <unit bldFile="/sf/mw/homescreensrv/screensavermodel" qmakeArgs="-r" proFile="screensavermodel.pro"/>
           </component>
         </collection>
         <collection name="hsactivityfw" long-name="Activity Framework" level="activityfw">
           <component name="hsactivityfw_build" long-name="Activity Framework Build" introduced="^4">
-            <unit bldFile="/sf/mw/homescreensrv/activityfw"/>
+            <unit bldFile="/sf/mw/homescreensrv/activityfw" qmakeArgs="-r" proFile="activityfw.pro"/>
           </component>
         </collection>
         <collection name="hsappkeyhandler" long-name="HS Appplication Key Handler" level="server">
           <component name="hsappkeyhandler_build" long-name="Appplication Key Handler Build" introduced="^4">
-            <unit bldFile="/sf/mw/homescreensrv/hsappkeyhandler"/>
+            <unit bldFile="/sf/mw/homescreensrv/hsappkeyhandler" qmakeArgs="-r" proFile="hsappkeyhandler.pro"/>
           </component>
         </collection>
         <collection name="homescreensrv_info" long-name="Home Screen Services Info" level="specific">
           <component name="homescreensrvconf" long-name="Home Screen Services Config" introduced="^4" class="config">
-            <unit bldFile="/sf/mw/homescreensrv/."/>
+            <unit bldFile="/sf/mw/homescreensrv/." qmakeArgs="-r" proFile="homescreensrv_exports_to_rom.pri"/>
           </component>
           <component name="homescreensrvrom" long-name="Home Screen Services ROM" introduced="^4">
             <unit bldFile="/sf/mw/homescreensrv/group"/>
           </component>
           <component name="homescreensrv_test" long-name="Home Screen Services Test" filter="test,unit_test" introduced="^4">
-            <unit bldFile="/sf/mw/homescreensrv/tsrc"/>
+            <unit bldFile="/sf/mw/homescreensrv/tsrc" qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN" proFile="tsrc.pro"/>
           </component>
         </collection>
       </block>
diff -r fcee787f22fe -r 5ab61259495b symbian4/mw/homescreensrvlegacy/package_definition.xml
--- a/symbian4/mw/homescreensrvlegacy/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/mw/homescreensrvlegacy/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -79,10 +79,10 @@
       <block name="homescreensrvlegacy" level="generic" long-name="Legacy Home Screen Services" levels="plugin framework server generic specific">
         <collection name="homescreensrvlegacy_plat" long-name="Legacy Home Screen Services Platform Interfaces" level="specific">
           <component name="ai_content_model_api" long-name="AI Content Model API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/homescreensrvlegacy/ai_content_model_api/group"/>
+            <unit bldFile="/sf/mw/homescreensrvlegacy/ai_content_model_api/group" proFile="group.pro"/>
           </component>
           <component name="ai_plugin_information_api" long-name="AI Plug-in Information API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/homescreensrvlegacy/ai_plugin_information_api/group"/>
+            <unit bldFile="/sf/mw/homescreensrvlegacy/ai_plugin_information_api/group" proFile="group.pro"/>
           </component>
         </collection>
       </block>
diff -r fcee787f22fe -r 5ab61259495b symbian4/mw/imghandling/package_definition.xml
--- a/symbian4/mw/imghandling/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/mw/imghandling/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -103,8 +103,8 @@
             <unit bldFile="/sf/mw/imghandling/imagehandlingutilities/thumbnailmanager/group"/>
           </component>
           <component name="thumbnailmanagerqt" filter="s60" long-name="Thumbnail Manager Qt" introduced="^4">
-            <unit bldFile="/sf/mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt" filter="!test"/>
-            <unit bldFile="/sf/mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt/tsrc" filter="test,unit_test"/>
+            <unit bldFile="/sf/mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt" filter="!test" proFile="thumbnailmanagerqt.pro" qmakeArgs="-r"/>
+            <unit bldFile="/sf/mw/imghandling/imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt/tsrc" filter="test,unit_test" proFile="test_qtnmwrapper.pro"/>
           </component>
         </collection>
       </block>
diff -r fcee787f22fe -r 5ab61259495b symbian4/mw/ipconnmgmt/package_definition.xml
--- a/symbian4/mw/ipconnmgmt/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/mw/ipconnmgmt/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -227,7 +227,7 @@
             <unit bldFile="/sf/mw/ipconnmgmt/group"/>
           </component>
           <component name="ipcm_qt_build" long-name="IP Connectivity Management Qt Build" introduced="^4">
-            <unit bldFile="/sf/mw/ipconnmgmt/."/>
+            <unit bldFile="/sf/mw/ipconnmgmt/." proFile="ipconnmgmt.pro" qmakeArgs="-r"/>
           </component>
         </collection>
       </block>
diff -r fcee787f22fe -r 5ab61259495b symbian4/mw/mmappfw/package_definition.xml
--- a/symbian4/mw/mmappfw/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/mw/mmappfw/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -156,7 +156,7 @@
             <unit bldFile="/sf/mw/mmappfw/mpx/viewframework/group"/>
           </component>
           <component name="mpxviewframeworkqt" long-name="MPX View Framework Qt" filter="s60">
-            <unit bldFile="/sf/mw/mmappfw/mpx/mpxviewframeworkqt"/>
+            <unit bldFile="/sf/mw/mmappfw/mpx/mpxviewframeworkqt" proFile="mpxviewframeworkqt.pro" qmakeArgs="-r -config rom"/>
           </component>
           <component name="mpx_build" filter="s60" long-name="MPX Build" introduced="^1">
             <!--  Move the export to another component or remove the #includes from this one -->
diff -r fcee787f22fe -r 5ab61259495b symbian4/mw/phonesrv/package_definition.xml
--- a/symbian4/mw/phonesrv/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/mw/phonesrv/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -234,7 +234,7 @@
         </collection>
         <collection name="phonesrv_info" long-name="Phone Server Info" level="generic">
           <component name="phonesrv_build" long-name="Phone Server Build" filter="s60">
-            <unit bldFile="/sf/mw/phonesrv/."/>
+            <unit bldFile="/sf/mw/phonesrv/." proFile="phonesrv.pro"/>
           </component>
         </collection>
       </block>
diff -r fcee787f22fe -r 5ab61259495b symbian4/mw/platformthemes/package_definition.xml
--- a/symbian4/mw/platformthemes/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/mw/platformthemes/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -80,7 +80,7 @@
         <collection name="platformthemes_info" long-name="Platform Themes Info">
           <component name="platformthemes_build" long-name="Platform Themes Build">
             <!-- no real structure in this package. Should break into collections / components -->
-            <unit bldFile="/sf/mw/platformthemes/."/>
+            <unit bldFile="/sf/mw/platformthemes/." proFile="platformthemes.pro"/>
           </component>
         </collection>
       </block>
diff -r fcee787f22fe -r 5ab61259495b symbian4/mw/qt/package_definition.xml
--- a/symbian4/mw/qt/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/mw/qt/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -84,25 +84,25 @@
         </collection>
         <collection name="qt_info" long-name="Qt Info" level="mw">
           <component name="qt_build" long-name="Qt Build" introduced="^2">
-            <unit bldFile="/sf/mw/qt/."/>
+            <unit bldFile="/sf/mw/qt/." proFile="projects.pro" 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 name="qtdemos" long-name="Qt Demos" level="app">
           <component name="qtdemos_build" long-name="Qt Demos Build" introduced="^2" filter="qtdemos">
-            <unit bldFile="/sf/mw/qt/demos"/>
+            <unit bldFile="/sf/mw/qt/demos" proFile="demos.pro" 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 name="qtexamples" long-name="Qt Examples" level="app">
           <component name="qtexamples_build" long-name="Qt Examples Build" introduced="^2" filter="qtexamples">
-            <unit bldFile="/sf/mw/qt/examples"/>
+            <unit bldFile="/sf/mw/qt/examples" proFile="examples.pro" 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 name="qt_tests" long-name="Qt Tests" level="app">
           <component name="qttestsauto" long-name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
-            <unit bldFile="/sf/mw/qt/tests/auto"/>
+            <unit bldFile="/sf/mw/qt/tests/auto" proFile="qtpauto.pro"/>
           </component>
           <component name="qttestsbenchmarks" long-name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
-            <unit bldFile="/sf/mw/qt/tests/benchmarks"/>
+            <unit bldFile="/sf/mw/qt/tests/benchmarks" proFile="benchmarks.pro" 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>
       </block>
diff -r fcee787f22fe -r 5ab61259495b symbian4/mw/qtextensions/package_definition.xml
--- a/symbian4/mw/qtextensions/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/mw/qtextensions/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -79,45 +79,45 @@
       <block name="qtextensions" level="generic" long-name="Qt Extensions" levels="tool mw app">
         <collection name="qtecomplugins" long-name="Qt ECom Plugins" level="app">
           <component name="qtecomplugins_build" filter="qtecomplugins" long-name="Qt ECom Plugin" purpose="development" introduced="^4" plugin="Y">
-            <unit bldFile="/sf/mw/qtextensions/qtecomplugins"/>
+            <unit bldFile="/sf/mw/qtextensions/qtecomplugins" proFile="qtecomplugins.pro" qmakeArgs="-r"/>
           </component>
           <component name="qtextensions_examples" filter="qtextensionsexamples" long-name="Qt ECom Plugin Examples" purpose="development" introduced="^4">
-            <unit bldFile="/sf/mw/qtextensions/qtecomplugins/examples"/>
+            <unit bldFile="/sf/mw/qtextensions/qtecomplugins/examples" proFile="examples.pro" qmakeArgs="-r"/>
           </component>
         </collection>
         <collection name="qthighway" long-name="Qt Highway" level="app">
           <component name="qthighway_build" filter="qthighway" long-name="Qt Highway" purpose="development" introduced="^4">
-            <unit bldFile="/sf/mw/qtextensions/qthighway"/>
+            <unit bldFile="/sf/mw/qtextensions/qthighway" proFile="qthighway.pro" qmakeArgs="-r"/>
           </component>
           <component name="qthighway_examples" filter="qtextensionsexamples" long-name="Qt Highway Examples" purpose="development" introduced="^4">
-            <unit bldFile="/sf/mw/qtextensions/qthighway/examples"/>
+            <unit bldFile="/sf/mw/qtextensions/qthighway/examples" proFile="examples.pro" qmakeArgs="-r"/>
           </component>
           <component name="qthighwaytests" filter="qtextensionstests" long-name="Qt Highway Tests" purpose="development" introduced="^4">
-            <unit bldFile="/sf/mw/qtextensions/qthighway/tests"/>
+            <unit bldFile="/sf/mw/qtextensions/qthighway/tests" proFile="tests.pro" qmakeArgs="-r"/>
           </component>
         </collection>
         <collection name="qtmobileextensions" long-name="Qt Mobile Extensions" level="app">
           <component name="qtmobileextensions_build" filter="qtextension" long-name="Qt Mobile Extensions" purpose="development" introduced="^4">
-            <unit bldFile="/sf/mw/qtextensions/qtmobileextensions"/>
+            <unit bldFile="/sf/mw/qtextensions/qtmobileextensions" proFile="qtmobileextensions.pro" qmakeArgs="-r"/>
           </component>
           <component name="qtmobileextensions_examples" filter="qtextensionsexamples" long-name="Qt Mobile Extensions Examples" purpose="development" introduced="^4">
-            <unit bldFile="/sf/mw/qtextensions/qtmobileextensions/examples"/>
+            <unit bldFile="/sf/mw/qtextensions/qtmobileextensions/examples" proFile="examples.pro" qmakeArgs="-r"/>
           </component>
         </collection>
         <collection name="qtmobility" long-name="Qt Mobility" level="mw">
           <component name="qtmobility_build" filter="qtmobility" long-name="Qt Mobility" purpose="development" introduced="^4">
-            <unit bldFile="/sf/mw/qtextensions/qtmobility"/>
+            <unit bldFile="/sf/mw/qtextensions/qtmobility" proFile="qtmobility.pro" qmakeArgs="-r"/>
           </component>
           <component name="qtmobility_examples" filter="qtextensionsexamples" long-name="Qt Mobility Examples" purpose="development" introduced="^4">
-            <unit bldFile="/sf/mw/qtextensions/qtmobility/examples"/>
+            <unit bldFile="/sf/mw/qtextensions/qtmobility/examples" proFile="examples.pro" qmakeArgs="-r"/>
           </component>
           <component name="qtmobilitytests" filter="qtextensionstests" long-name="Qt Extensions Tests" purpose="development" introduced="^4">
-            <unit bldFile="/sf/mw/qtextensions/qtmobility/tests"/>
+            <unit bldFile="/sf/mw/qtextensions/qtmobility/tests" proFile="tests.pro" qmakeArgs="-r"/>
           </component>
         </collection>
         <collection name="qhbstyle" level="mw" long-name="Qt Orbit Style">
           <component name="qhbstyle_build" long-name="Qt Orbit Style Build" introduced="^4">
-            <unit bldFile="/sf/mw/qtextensions/qhbstyle"/>
+            <unit bldFile="/sf/mw/qtextensions/qhbstyle" qmakeArgs="-r" proFile="qhbstyle.pro"/>
           </component>
         </collection>
         <collection name="qtextensions_info" long-name="Qt Extensions Info" level="app">
@@ -126,7 +126,7 @@
           </component>
           <component name="qtextensions_build" long-name="Qt Extensions Build" introduced="^4">
             <!-- break this up into the above collections-->
-            <unit bldFile="/sf/mw/qtextensions/."/>
+            <unit bldFile="/sf/mw/qtextensions/." proFile="qtextensions.pro" qmakeArgs="-r"/>
           </component>
         </collection>
       </block>
diff -r fcee787f22fe -r 5ab61259495b symbian4/mw/searchsrv/package_definition.xml
--- a/symbian4/mw/searchsrv/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/mw/searchsrv/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -127,7 +127,7 @@
         </collection>
         <collection name="qcpix" long-name="Qt CPIX" level="engine">
           <component name="qcpix_build" long-name="Qt CPIX Build" introduced="^4">
-            <unit bldFile="/sf/mw/searchsrv/qcpix"/>
+            <unit bldFile="/sf/mw/searchsrv/qcpix" proFile="qcpix.pro"/>
           </component>
         </collection>
         <collection name="searchsrv_info" long-name="Search Services Info">
diff -r fcee787f22fe -r 5ab61259495b symbian4/mw/securitysrv/package_definition.xml
--- a/symbian4/mw/securitysrv/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/mw/securitysrv/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -204,7 +204,7 @@
             <unit bldFile="/sf/mw/securitysrv/securitydialogs/lockapp/group"/>
           </component>
           <component name="secuinotifications" long-name="Security UI Notifications" introduced="^4" filter="s60">
-            <unit bldFile="/sf/mw/securitysrv/securitydialogs/secuinotifications"/>
+            <unit bldFile="/sf/mw/securitysrv/securitydialogs/secuinotifications" proFile="secuinotifications.pro" qmakeArgs="-r"/>
           </component>
         </collection>
         <collection name="boottimeintegritycheck" long-name="Boot Time Integrity Check" level="plugin">
diff -r fcee787f22fe -r 5ab61259495b symbian4/mw/usbservices/package_definition.xml
--- a/symbian4/mw/usbservices/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/mw/usbservices/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -167,7 +167,7 @@
             <unit bldFile="/sf/mw/usbservices/usbuis/imageprintui/group"/>
           </component>
           <component name="usbuiqt" long-name="USB UI Qt" introduced="^4" filter="s60">
-            <unit bldFile="/sf/mw/usbservices/usbuis/usbuiqt"/>
+            <unit bldFile="/sf/mw/usbservices/usbuis/usbuiqt" proFile="usbapplication.pro"/>
           </component>
         </collection>
         <collection name="usbservices_test" long-name="USB Services Test" level="server">
diff -r fcee787f22fe -r 5ab61259495b symbian4/mw/webruntime/package_definition.xml
--- a/symbian4/mw/webruntime/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/mw/webruntime/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -80,7 +80,7 @@
         <!-- need to break up this package nito collections and components -->
         <collection name="webruntime_info" long-name="Web Runtime Info">
           <component name="webruntime_build" long-name="Web Runtime Build" introduced="^4">
-            <unit bldFile="/sf/mw/webruntime/."/>
+            <unit bldFile="/sf/mw/webruntime/." proFile="cwrt.pro" qmakeArgs="&quot;what+=ninetwo&quot; &quot;what+=tenone&quot; &quot;what+=qt_unstable&quot; &quot;what+=wrtlite&quot; &quot;what+=exportiby&quot;"/>
           </component>
         </collection>
       </block>
diff -r fcee787f22fe -r 5ab61259495b symbian4/mw/wirelessacc/package_definition.xml
--- a/symbian4/mw/wirelessacc/package_definition.xml	Wed May 19 10:37:39 2010 +0100
+++ b/symbian4/mw/wirelessacc/package_definition.xml	Wed May 19 10:41:47 2010 +0100
@@ -122,7 +122,7 @@
         <collection name="wlanutilities" long-name="WLAN Utilities" level="generic">
           <component name="wlanutilities_build" long-name="WLAN Utilities Qt" introduced="^4" filter="s60">
             <!-- is this uinit needed, or is it sufficient to uncomment the units in the below components? -->
-            <unit bldFile="/sf/mw/wirelessacc/wlanutilities"/>
+            <unit bldFile="/sf/mw/wirelessacc/wlanutilities" proFile="wlanutilities.pro" qmakeArgs="-r"/>
           </component>
           <component name="wlanqtutilities" filter="s60" long-name="WLAN Qt Utilities" introduced="^4" class="placeholder">
             <!--<unit bldFile="wlanutilities/wlanplugin/group" qt:proFile="wlanqtutilities.pro"/>-->