--- a/symbian4/mw/btservices/package_definition.xml	Fri May 21 16:11:21 2010 +0100
+++ b/symbian4/mw/btservices/package_definition.xml	Mon May 24 19:17:43 2010 +0100
@@ -137,6 +137,9 @@
 <component name="btctrldcmoadapter" filter="s60" long-name="Bluetooth Control DCMO Adapter" introduced="^3" plugin="Y">
 <unit bldFile="/sf/mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
 </component>
+<component name="btserviceutil" filter="s60" long-name="Bluetooth Service Utils">
+<unit bldFile="/sf/mw/btservices/bluetoothengine/btserviceutil/group"/>
+</component>
 </collection>
 <collection name="bluetoothappprofiles" long-name="Bluetooth Application Profiles" level="plugin">
 <component name="avrcp" long-name="Bluetooth AVRCP" introduced="9.1" purpose="optional">

--- a/symbian4/mw/homescreensrv/package_definition.xml	Fri May 21 16:11:21 2010 +0100
+++ b/symbian4/mw/homescreensrv/package_definition.xml	Mon May 24 19:17:43 2010 +0100
@@ -133,7 +133,7 @@
 </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" qmakeArgs="-r" proFile="homescreensrv_exports_to_rom.pri"/>
+<unit bldFile="/sf/mw/homescreensrv" qmakeArgs="-r" proFile="homescreensrv.pro"/>
 </component>
 <component name="homescreensrvrom" long-name="Home Screen Services ROM" introduced="^4">
 <unit bldFile="/sf/mw/homescreensrv/group"/>

--- a/symbian4/mw/qt/package_definition.xml	Fri May 21 16:11:21 2010 +0100
+++ b/symbian4/mw/qt/package_definition.xml	Mon May 24 19:17:43 2010 +0100
@@ -61,7 +61,7 @@
 </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" proFile="projects.pro" qmakeArgs="-r"/>
+<unit bldFile="/sf/mw/qt" proFile="projects.pro" qmakeArgs="-r -config sgimagelite_support"/>
 </component>
 </collection>
 <collection name="qtdemos" long-name="Qt Demos" level="app">

--- a/symbian4/mw/securitysrv/package_definition.xml	Fri May 21 16:11:21 2010 +0100
+++ b/symbian4/mw/securitysrv/package_definition.xml	Mon May 24 19:17:43 2010 +0100
@@ -174,8 +174,8 @@
 <component name="securitynotifier" filter="s60" long-name="Security Notifier">
 <unit bldFile="/sf/mw/securitysrv/securitydialogs/securitynotifier/group"/>
 </component>
-<component name="lockclient" filter="s60" long-name="Lock Client" introduced="^3">
-<unit bldFile="/sf/mw/securitysrv/securitydialogs/lockclient/group"/>
+<component name="lockclient" filter="s60" long-name="Lock Client" introduced="^4">
+<unit bldFile="/sf/mw/securitysrv/securitydialogs/lockclient/group" proFile="lockclient.pro" qmakeArgs="-r"/>
 </component>
 <component name="lockapp" filter="s60" long-name="Lock Application" introduced="^3">
 <unit bldFile="/sf/mw/securitysrv/securitydialogs/lockapp/group"/>