diff -r a321ee3c6900 -r 1086018a61f0 symbian4/single/sysdefs/system_model.xml
--- a/symbian4/single/sysdefs/system_model.xml	Fri May 21 16:10:56 2010 +0100
+++ b/symbian4/single/sysdefs/system_model.xml	Mon May 24 19:17:30 2010 +0100
@@ -3250,8 +3250,8 @@
 <component name="securitynotifier" filter="s60" long-name="Security Notifier">
 <unit bldFile="mw/securitysrv/securitydialogs/securitynotifier/group"/>
 </component>
-<component name="lockclient" filter="s60" long-name="Lock Client" introduced="^3">
-<unit bldFile="mw/securitysrv/securitydialogs/lockclient/group"/>
+<component name="lockclient" filter="s60" long-name="Lock Client" introduced="^4">
+<unit bldFile="mw/securitysrv/securitydialogs/lockclient/group" proFile="lockclient.pro" qmakeArgs="-r"/>
 </component>
 <component name="lockapp" filter="s60" long-name="Lock Application" introduced="^3">
 <unit bldFile="mw/securitysrv/securitydialogs/lockapp/group"/>
@@ -5308,6 +5308,9 @@
 <component name="btctrldcmoadapter" filter="s60" long-name="Bluetooth Control DCMO Adapter" introduced="^3" plugin="Y">
 <unit bldFile="mw/btservices/bluetoothengine/btctrldcmoadapter/group"/>
 </component>
+<component name="btserviceutil" filter="s60" long-name="Bluetooth Service Utils">
+<unit bldFile="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">
@@ -6125,7 +6128,7 @@
 </collection>
 <collection name="qt_info" long-name="Qt Info" level="mw">
 <component name="qt_build" long-name="Qt Build" introduced="^2">
-<unit bldFile="mw/qt" proFile="projects.pro" qmakeArgs="-r"/>
+<unit bldFile="mw/qt" proFile="projects.pro" qmakeArgs="-r -config sgimagelite_support"/>
 </component>
 </collection>
 <collection name="qtdemos" long-name="Qt Demos" level="app">
@@ -7162,7 +7165,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="mw/homescreensrv" qmakeArgs="-r" proFile="homescreensrv_exports_to_rom.pri"/>
+<unit bldFile="mw/homescreensrv" qmakeArgs="-r" proFile="homescreensrv.pro"/>
 </component>
 <component name="homescreensrvrom" long-name="Home Screen Services ROM" introduced="^4">
 <unit bldFile="mw/homescreensrv/group"/>