--- a/symbian3/single/sysdefs/system_model_3.0.xml	Wed May 05 17:02:22 2010 +0100
+++ b/symbian3/single/sysdefs/system_model_3.0.xml	Wed May 05 18:13:12 2010 +0100
@@ -1216,10 +1216,20 @@
 <component id="privacyprotocolmodule" name="Privacy Protocol Module" introduced="^2" purpose="optional" class="plugin">
 <unit bldFile="/os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="/os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
 </component>
+<component id="suplproxyprotocolmodule" name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" class="plugin">
+<unit bldFile="/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group" mrp="/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
+</component>
+<component id="suplprotocolmodule" name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" class="plugin">
+<unit bldFile="/os/lbs/networkprotocolmodules/suplprotocolmodule/group" mrp="/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
+</component>
 <component id="suplrrlpasn1" filter="sf_build" name="SUPL RRLP ASN1 Parser">
 <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
 <unit bldFile="/os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
 </component>
+<component id="suplrrlpprotocol" filter="sf_build" name="SUPL RRLP Protocol Module">
+<!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+<unit bldFile="/os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/group"/>
+</component>
 </collection>
 <collection id="lbsapitest" name="Location API Tests" level="application-interface">
 
@@ -6401,7 +6411,7 @@
 </collection>
 <collection id="qt_info" name="Qt Info" level="mw">
 <component id="qt_build" name="Qt Build" introduced="^2">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qt" 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"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qt" qt:proFile="projects.pro" qt:qmakeArgs="-r"/>
 </component>
 </collection>
 <collection id="qtdemos" name="Qt Demos" level="app">
@@ -8814,6 +8824,12 @@
 <component id="ds_folder_util_api" name="DS Folder Util API" class="api" filter="s60">
 <unit bldFile="/app/contentcontrol/contentctrl_plat/ds_folder_util_api/group"/>
 </component>
+<component id="adapter_customization_api" name="Adapter Customization API" class="api" filter="s60">
+<unit bldFile="/app/contentcontrol/contentctrl_plat/adapter_customization_api/group"/>
+</component>
+<component id="ds_data_modification_api" name="DS Data Modification API" class="api" filter="s60">
+<unit bldFile="/app/contentcontrol/contentctrl_plat/ds_data_modification_api/group"/>
+</component>
 </collection>
 <collection id="dsdcmoadapter" name="Data Sync DCMO Adapter" level="plugin">
 <!-- Component at wrong rank, should move down a directory -->
@@ -8898,9 +8914,6 @@
 <component id="uisettingssrv" filter="s60" name="UI Settings Server">
 <unit bldFile="/app/devicecontrol/customization/uisettingssrv/bld"/>
 </component>
-<component id="isadapter" filter="s60" name="Idle State Adapter" class="plugin">
-<unit bldFile="/app/devicecontrol/customization/isadapter/bld"/>
-</component>
 <component id="supadapter" filter="s60" name="Startup Adapter" class="plugin">
 <unit bldFile="/app/devicecontrol/customization/supadapter/bld"/>
 </component>
@@ -11093,7 +11106,7 @@
 </component>
 </collection>
 <collection id="stifui" name="STIF UI" level="generic">
-<component id="stifui_avkon" filter="s60" name="STIF UI for Avkon" purpose="development">
+<component id="stifui_avkon" filter="s60" name="STIF UI for Avkon" purpose="development" target="device">
 <unit bldFile="/app/rndtools/stifui/avkon/group"/>
 </component>