Mercurial Mercurial > oss > FCL > sftools > fbf > projects > platforms / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorShabe Razvi <shaber@symbian.org>
Mon, 21 Jun 2010 14:31:20 +0100
changeset 661 c82cee17fb05
parent 660 85bd8e9eeb73 (current diff)
parent 654 8427bbf963ee (diff)
child 662 b1716671cef8
Merge
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/single/sources_3.0.0.csv	Mon Jun 21 14:31:20 2010 +0100
@@ -0,0 +1,120 @@
+source,dst,type,pattern,sysdef
+//v800008/Builds01/mercurial_internal/rnd/rndonly/aricent/,/rnd/rndonly/aricent,changeset,2b41c6133edf,
+//v800008/Builds01/mercurial_internal/rnd/rndonly/ibm/,/rnd/rndonly/ibm,changeset,04ac8a231adf,
+//v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,changeset,a94919327585,
+//v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,changeset,afb66031ac23,
+//v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,changeset,bc65ca6d8d9c,
+//v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,changeset,3308607f8c27,
+http://developer.symbian.org/oss/FCL/sf/adaptation/beagleboard/,/sf/adaptation/beagleboard,changeset,2905910218db,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adaptation/qemu/,/sf/adaptation/qemu,changeset,bb16bb5b2818,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,changeset,ac0dcfe5059d,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/camera/,/sf/app/camera,changeset,53c8aa5d97a3,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/commonemail/,/sf/app/commonemail,changeset,67369d1b217f,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/conntools/,/sf/app/conntools,changeset,a49137138563,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/contacts/,/sf/app/contacts,changeset,35018d46c3dc,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/contentcontrol/,/sf/app/contentcontrol,changeset,8423bb7ba1d2,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/conversations/,/sf/app/conversations,changeset,76f25fb7a6a1,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/devicecontrol/,/sf/app/devicecontrol,changeset,7f4d10e92162,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/dictionary/,/sf/app/dictionary,changeset,38691ba2fda5,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/files/,/sf/app/files,changeset,efe289f793e7,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/graphicsuis/,/sf/app/graphicsuis,changeset,1882882c7f9c,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/helps/,/sf/app/helps,changeset,326673dff2bf,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/homescreen/,/sf/app/homescreen,changeset,a1e3af341cc7,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/homescreentools/,/sf/app/homescreentools,changeset,cbece5a7b057,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/im/,/sf/app/im,changeset,c303fa51f66d,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/imgeditor/,/sf/app/imgeditor,changeset,a5c0fe6456b2,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/iptelephony/,/sf/app/iptelephony,changeset,43658d24f35d,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/jrt/,/sf/app/jrt,changeset,5337859c5963,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/location/,/sf/app/location,changeset,64522df74558,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/messaging/,/sf/app/messaging,changeset,7e4e4bcc75b6,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/mmsharinguis/,/sf/app/mmsharinguis,changeset,95754dcd27ad,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/musicplayer/,/sf/app/musicplayer,changeset,56b11cf8addb,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/organizer/,/sf/app/organizer,changeset,b752ea878caa,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/phone/,/sf/app/phone,changeset,4853f386dec0,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/photos/,/sf/app/photos,changeset,78ad99c24f08,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/podcatcher/,/sf/app/podcatcher,changeset,ee650bbb958e,package_definition.xml
+http://developer.symbian.org/oss/FCL/sf/app/printing/,/sf/app/printing,changeset,160f5df4c0e6,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/profile/,/sf/app/profile,changeset,232e127a1fe4,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/radio/,/sf/app/radio,changeset,9f3ff466f56b,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/rndtools/,/sf/app/rndtools,changeset,aefcba28a3e0,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/screensaver/,/sf/app/screensaver,changeset,2e08ef6b6eda,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/settingsuis/,/sf/app/settingsuis,changeset,f42d5229d8ed,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/speechsrv/,/sf/app/speechsrv,changeset,994c46bea969,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/techview/,/sf/app/techview,changeset,6beaa9cf4752,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/utils/,/sf/app/utils,changeset,82ca176301de,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/videoeditor/,/sf/app/videoeditor,changeset,951a5db380a0,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/videoplayer/,/sf/app/videoplayer,changeset,8f0df5c82986,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/videotelephony/,/sf/app/videotelephony,changeset,9ec13d39cc2e,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/voicerec/,/sf/app/voicerec,changeset,f962425b9f8b,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/app/webuis/,/sf/app/webuis,changeset,3154c14a33db,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/accesssec/,/sf/mw/accesssec,changeset,3634639e6dc7,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/appinstall/,/sf/mw/appinstall,changeset,f9033e605ee2,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/appsupport/,/sf/mw/appsupport,changeset,98afcc9489c0,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/btservices/,/sf/mw/btservices,changeset,53b7818cd282,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/camerasrv/,/sf/mw/camerasrv,changeset,0e2bdb6a0855,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/classicui/,/sf/mw/classicui,changeset,d304fad47bf4,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/dlnasrv/,/sf/mw/dlnasrv,changeset,bfb2712e420e,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/drm/,/sf/mw/drm,changeset,bd9b181e836a,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/gsprofilesrv/,/sf/mw/gsprofilesrv,changeset,3b47783fdf16,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,changeset,be046265c55d,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/helix/,/sf/mw/helix,changeset,c0474fab502e,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,changeset,8a75bf74485c,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/imghandling/,/sf/mw/imghandling,changeset,ad31f4183ddc,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/imsrv/,/sf/mw/imsrv,changeset,7797b2f86d2b,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/inputmethods/,/sf/mw/inputmethods,changeset,5e18d8c489d6,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/ipappprotocols/,/sf/mw/ipappprotocols,changeset,a7d1e54a7332,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/ipappsrv/,/sf/mw/ipappsrv,changeset,91f50911ea81,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/ipconnmgmt/,/sf/mw/ipconnmgmt,changeset,0a9e01492035,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/legacypresence/,/sf/mw/legacypresence,changeset,10246e066a50,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/locationsrv/,/sf/mw/locationsrv,changeset,9c303455e256,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/mds/,/sf/mw/mds,changeset,4a4892eec172,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/messagingmw/,/sf/mw/messagingmw,changeset,c540a10963a1,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/metadatasrv/,/sf/mw/metadatasrv,changeset,533a463dabdc,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/mmappfw/,/sf/mw/mmappfw,changeset,1e2709dc536f,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/mmmw/,/sf/mw/mmmw,changeset,2eb3b066cc7d,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/mmuifw/,/sf/mw/mmuifw,changeset,125793e17004,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/netprotocols/,/sf/mw/netprotocols,changeset,f21293830889,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/networkingdm/,/sf/mw/networkingdm,changeset,ad089248fd2f,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/phonesrv/,/sf/mw/phonesrv,changeset,71268bfa7aea,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/platformtools/,/sf/mw/platformtools,changeset,2b9101578f5e,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/qt/,/sf/mw/qt,changeset,4b6ee5efea19,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/remoteconn/,/sf/mw/remoteconn,changeset,523717cdb0ad,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/remotemgmt/,/sf/mw/remotemgmt,changeset,4c1d1f271d77,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/remotestorage/,/sf/mw/remotestorage,changeset,6ce8d7d90cf8,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/securitysrv/,/sf/mw/securitysrv,changeset,33ad376816a8,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/serviceapi/,/sf/mw/serviceapi,changeset,1aa6688bfd6b,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/serviceapifw/,/sf/mw/serviceapifw,changeset,02db64fb1712,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/shortlinkconn/,/sf/mw/shortlinkconn,changeset,2553637c2525,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/srvdiscovery/,/sf/mw/srvdiscovery,changeset,8116cc943311,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/svgt/,/sf/mw/svgt,changeset,9be6eed35a80,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/uiaccelerator/,/sf/mw/uiaccelerator,changeset,f93c875b566e,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/uiresources/,/sf/mw/uiresources,changeset,3ab2c0719337,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/uitools/,/sf/mw/uitools,changeset,3c40afc7ecad,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/usbservices/,/sf/mw/usbservices,changeset,d895b6d953c9,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/videoutils/,/sf/mw/videoutils,changeset,913622afaa4b,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/vpnclient/,/sf/mw/vpnclient,changeset,d1a0d37b52a1,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/web/,/sf/mw/web,changeset,4bd5176e1bc8,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/websrv/,/sf/mw/websrv,changeset,32ab7ae9ec94,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/mw/wirelessacc/,/sf/mw/wirelessacc,changeset,024ee8b21fe2,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/boardsupport/,/sf/os/boardsupport,changeset,582f97e694c5,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/bt/,/sf/os/bt,changeset,32ba20339036,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/buildtools/,/sf/os/buildtools,changeset,06f00a153f2a,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/cellularsrv/,/sf/os/cellularsrv,changeset,664a5fed40c6,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/commsfw/,/sf/os/commsfw,changeset,9644881fedd0,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,changeset,d0917ab8b45e,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/devicesrv/,/sf/os/devicesrv,changeset,5ced40f3c181,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/graphics/,/sf/os/graphics,changeset,0709f76d91e5,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/imagingext/,/sf/os/imagingext,changeset,e5ca06a707ac,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,changeset,cc88aabd867b,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/lbs/,/sf/os/lbs,changeset,24bd7242888d,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/mm/,/sf/os/mm,changeset,67584cc761d1,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/networkingsrv/,/sf/os/networkingsrv,changeset,b9e98a1244ee,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/ossrv/,/sf/os/ossrv,changeset,3520f1ef6bf6,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/persistentdata/,/sf/os/persistentdata,changeset,fcc16690f446,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/security/,/sf/os/security,changeset,564220cc963b,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/textandloc/,/sf/os/textandloc,changeset,c83f1006fff0,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/usb/,/sf/os/usb,changeset,d2197ff6de2b,
+http://developer.symbian.org/oss/MCL/sf/os/wlan/,/sf/os/wlan,changeset,af3fb27c7511,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,changeset,6b9cbc8ad81c,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/os/osrndtools/,/sf/os/osrndtools,changeset,da2cedce4920,layers.sysdef.xml
+http://developer.symbian.org/oss/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,changeset,e541da0d3b0d,layers.sysdef.xml
--- a/symbian4/single/sysdefs/auto/system_model.xml	Fri Jun 18 15:56:17 2010 +0100
+++ b/symbian4/single/sysdefs/auto/system_model.xml	Mon Jun 21 14:31:20 2010 +0100
@@ -283,9 +283,12 @@
 <component name="euser" long-name="User Library" purpose="mandatory">
 <unit bldFile="os/kernelhwsrv/kernel/eka/euser" mrp="os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
 </component>
-<component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory">
+<component name="compsupp" long-name="RVCT Compiler Runtime Support" filter="gt" purpose="mandatory">
 <unit bldFile="os/kernelhwsrv/kernel/eka/compsupp" mrp="os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
 </component>
+<component name="compsupp_gcc" long-name="GCC Compiler Runtime Support" filter="gt,sf_build" purpose="mandatory">
+<unit bldFile="os/kernelhwsrv/kernel/eka/compsupp/gcce"/>
+</component>
 <component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
 <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
 </component>
@@ -3361,9 +3364,12 @@
 <unit bldFile="mw/accesssec/accesssec_plat/eap_type_api/group"/>
 </component>
 </collection>
-<collection name="securitysettings" long-name="Security Settings QT" level="generic">
-<component name="securitysettings_build" long-name="Security Settings Build" introduced="^4">
-<unit bldFile="mw/accesssec/securitysettings" qmakeArgs="-r" proFile="securitysettings.pro"/>
+<collection name="securitysettings" long-name="WLAN Security Settings" level="specific">
+<component name="accesssec_qtconfigutils" filter="s60" long-name="Access Security Config Utils" introduced="^4">
+<unit bldFile="mw/accesssec/securitysettings/qtconfigutils" proFile="qtconfigutils.pro" qmakeArgs="-r"/>
+</component>
+<component name="cpwlansecurityuiplugins" filter="s60" long-name="Control Panel WLAN Security UI Plugins" introduced="^4">
+<unit bldFile="mw/accesssec/securitysettings/cpwlansecurityuiplugins" proFile="cpwlansecurityuiplugins.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="eapol" long-name="EAPOL" level="framework">
@@ -7781,22 +7787,22 @@
 <unit bldFile="app/contacts/phonebookengines/cntfindplugin" proFile="cntfindplugin.pro"/>
 </component>
 <component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
-<unit bldFile="app/contacts/phonebookengines/contactsmodel/groupsql" mrp="app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
+<unit bldFile="app/contacts/phonebookengines/contactsmodel" proFile="contactsmodel.pro"/>
 </component>
 <component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
 <unit bldFile="app/contacts/phonebookengines/cntsortplugin" proFile="cntsortplugin.pro"/>
 </component>
-<component name="mobcntmodel" filter="s60" long-name="Mobile Contacts Model" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/mobcntmodel" proFile="mobcntmodel.pro"/>
-</component>
-<component name="mobcntactions" filter="s60" long-name="Mobile Contacts Actions" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/mobcntactions" proFile="mobcntactions.pro"/>
+<component name="cntlistmodel" filter="s60" long-name="Contacts List Model" introduced="^4">
+<unit bldFile="app/contacts/phonebookengines/cntlistmodel" proFile="cntlistmodel.pro"/>
+</component>
+<component name="cntactions" filter="s60" introduced="^4">
+<unit bldFile="app/contacts/phonebookengines/cntactions" proFile="cntactions.pro"/>
 </component>
 <component name="cntmaptileservice" filter="s60" long-name="Contacts Map Tile Service" introduced="^4">
 <unit bldFile="app/contacts/phonebookengines/cntmaptileservice" proFile="cntmaptileservice.pro"/>
 </component>
-<component name="simutility" filter="s60" long-name="SIM Utility" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/simutility" proFile="simutility.pro"/>
+<component name="cndsimutility" filter="s60" long-name="Contacts SIM Utility" introduced="^4">
+<unit bldFile="app/contacts/phonebookengines/cntsimutility" proFile="cntsimutility.pro"/>
 </component>
 <component name="cntimageutility" long-name="Contacts Image Utility" filter="s60" introduced="^4">
 <unit bldFile="app/contacts/phonebookengines/cntimageutility" proFile="cntimageutility.pro"/>
--- a/symbian4/single/sysdefs/system_model.xml	Fri Jun 18 15:56:17 2010 +0100
+++ b/symbian4/single/sysdefs/system_model.xml	Mon Jun 21 14:31:20 2010 +0100
@@ -283,9 +283,12 @@
 <component name="euser" long-name="User Library" purpose="mandatory">
 <unit bldFile="os/kernelhwsrv/kernel/eka/euser" mrp="os/kernelhwsrv/kernel/eka/euser/base_e32_euser.mrp"/>
 </component>
-<component name="compsupp" long-name="Compiler Runtime Support" filter="gt" purpose="mandatory">
+<component name="compsupp" long-name="RVCT Compiler Runtime Support" filter="gt" purpose="mandatory">
 <unit bldFile="os/kernelhwsrv/kernel/eka/compsupp" mrp="os/kernelhwsrv/kernel/eka/compsupp/base_e32_compsupp.mrp"/>
 </component>
+<component name="compsupp_gcc" long-name="GCC Compiler Runtime Support" filter="gt,sf_build" purpose="mandatory">
+<unit bldFile="os/kernelhwsrv/kernel/eka/compsupp/gcce"/>
+</component>
 <component name="fileserver" long-name="File Server" filter="gt" purpose="mandatory">
 <unit bldFile="os/kernelhwsrv/userlibandfileserver/fileserver/group" mrp="os/kernelhwsrv/userlibandfileserver/fileserver/group/base_f32.mrp"/>
 </component>
@@ -7796,22 +7799,22 @@
 <unit bldFile="app/contacts/phonebookengines/cntfindplugin" proFile="cntfindplugin.pro"/>
 </component>
 <component name="contactsmodel" long-name="Contacts Model" introduced="ER5" purpose="optional">
-<unit bldFile="app/contacts/phonebookengines/contactsmodel/groupsql" mrp="app/contacts/phonebookengines/contactsmodel/groupsql/app-engines_cntmodel.mrp" version="2"/>
+<unit bldFile="app/contacts/phonebookengines/contactsmodel" profile="contactsmodel.pro"/>
 </component>
 <component name="cntsortplugin" filter="s60" long-name="Contacts Sort Plugin" introduced="^2" plugin="Y">
 <unit bldFile="app/contacts/phonebookengines/cntsortplugin" proFile="cntsortplugin.pro"/>
 </component>
-<component name="mobcntmodel" filter="s60" long-name="Mobile Contacts Model" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/mobcntmodel" proFile="mobcntmodel.pro"/>
-</component>
-<component name="mobcntactions" filter="s60" long-name="Mobile Contacts Actions" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/mobcntactions" proFile="mobcntactions.pro"/>
+<component name="cntlistmodel" filter="s60" long-name="Contacts List Model" introduced="^4">
+<unit bldFile="app/contacts/phonebookengines/cntlistmodel" proFile="cntlistmodel.pro"/>
+</component>
+<component name="cntactions" filter="s60" long-name="Contacts Actions" introduced="^4">
+<unit bldFile="app/contacts/phonebookengines/cntactions" proFile="cntactions.pro"/>
 </component>
 <component name="cntmaptileservice" filter="s60" long-name="Contacts Map Tile Service" introduced="^4">
 <unit bldFile="app/contacts/phonebookengines/cntmaptileservice" proFile="cntmaptileservice.pro"/>
 </component>
-<component name="simutility" filter="s60" long-name="SIM Utility" introduced="^4">
-<unit bldFile="app/contacts/phonebookengines/simutility" proFile="simutility.pro"/>
+<component name="cntsimutility" filter="s60" long-name="Contacts SIM Utility" introduced="^4">
+<unit bldFile="app/contacts/phonebookengines/cntsimutility" proFile="cntsimutility.pro"/>
 </component>
 <component name="cntimageutility" long-name="Contacts Image Utility" filter="s60" introduced="^4">
 <unit bldFile="app/contacts/phonebookengines/cntimageutility" proFile="cntimageutility.pro"/>
FCL/sftools/fbf/projects/platforms