--- a/qtmobility/src/s60installs/s60installs.pro	Thu Apr 01 08:30:34 2010 +0300
+++ b/qtmobility/src/s60installs/s60installs.pro	Fri Apr 16 15:51:22 2010 +0300
@@ -43,7 +43,21 @@
     } else {
     EPOCROOT50 = $$(EPOCROOT50)
     }
+
+    qtmobilitydeployment.sources = \
+        $$(EPOCROOT50)epoc32/release/armv5/urel/QtMessaging.dll \
+        $$(EPOCROOT50)epoc32/release/armv5/urel/QtServiceFramework.dll \
+        $$(EPOCROOT50)epoc32/release/armv5/urel/SFWDatabaseManagerServer.exe \
+        $$(EPOCROOT50)epoc32/release/armv5/urel/QtLocation.dll \
+        $$(EPOCROOT50)epoc32/release/armv5/urel/QtSystemInfo.dll \
+        $$(EPOCROOT50)epoc32/release/armv5/urel/QtPublishSubscribe.dll \
+        $$(EPOCROOT50)epoc32/release/armv5/urel/PSPathMapperServer.exe \
+#        $$(EPOCROOT50)epoc32/release/armv5/urel/QtContacts.dll \
+#        $$(EPOCROOT50)epoc32/release/armv5/urel/QtVersit.dll \
+#        $$(EPOCROOT50)epoc32/release/armv5/urel/QtMedia.dll \
+#        $$(EPOCROOT50)epoc32/release/armv5/urel/m3u.dll
     
+
     bearer = \
         "IF package(0x1028315F)" \
         "   \"$$EPOCROOT50\epoc32/release/armv5/urel/QtBearer.dll\" - \"!:\\sys\\bin\\QtBearer.dll\"" \
@@ -55,7 +69,48 @@
         "   \"$$EPOCROOT50\epoc32/release/armv5/urel/QtBearer.dll\" - \"!:\\sys\\bin\\QtBearer.dll\"" \
         "ENDIF"
 
+#    contacts = \
+#        "IF package(0x1028315F)" \
+#        "   \"$$EPOCROOT50\epoc32/release/armv5/urel/mobapicontactspluginsymbian.dll\" - \"!:\\sys\\bin\\mobapicontactspluginsymbian.dll\"" \
+#        "ELSEIF package(0x102752AE)" \
+#        "   \"$$EPOCROOT32\epoc32/release/armv5/urel/mobapicontactspluginsymbian.dll\" - \"!:\\sys\\bin\\mobapicontactspluginsymbian.dll\"" \
+#        "ELSEIF package(0x102032BE)" \
+#        "   \"$$EPOCROOT31\epoc32/release/armv5/urel/mobapicontactspluginsymbian.dll\" - \"!:\\sys\\bin\\mobapicontactspluginsymbian.dll\"" \
+#        "ELSE" \
+#        "   \"$$EPOCROOT50\epoc32/release/armv5/urel/mobapicontactspluginsymbian.dll\" - \"!:\\sys\\bin\\mobapicontactspluginsymbian.dll\"" \
+#        "ENDIF" \
+#        "\"$$EPOCROOT50\epoc32/release/armv5/urel/mobapicontactspluginsymbiansim.dll\" - \"!:\\sys\\bin\\mobapicontactspluginsymbiansim.dll\""
+        
+#    multimedia = \
+#        "IF package(0x1028315F)" \
+#        "   \"$$EPOCROOT50\epoc32/release/armv5/urel/QtMobilityMultimediaEngine.dll\" - \"!:\\sys\\bin\\QtMobilityMultimediaEngine.dll\"" \
+#        "ELSEIF package(0x102752AE)" \
+#        "   \"$$EPOCROOT32\epoc32/release/armv5/urel/QtMobilityMultimediaEngine.dll\" - \"!:\\sys\\bin\\QtMobilityMultimediaEngine.dll\"" \
+#        "ELSEIF package(0x102032BE)" \
+#        "   \"$$EPOCROOT31\epoc32/release/armv5/urel/QtMobilityMultimediaEngine.dll\" - \"!:\\sys\\bin\\QtMobilityMultimediaEngine.dll\"" \
+#        "ELSE" \
+#        "   \"$$EPOCROOT50\epoc32/release/armv5/urel/QtMobilityMultimediaEngine.dll\" - \"!:\\sys\\bin\\QtMobilityMultimediaEngine.dll\"" \
+#        "ENDIF"
+
+#    pluginstubs = \
+#        "\"$$QT_MOBILITY_BUILD_TREE/plugins/contacts/symbian/qmakepluginstubs/mobapicontactspluginsymbian.qtplugin\"  - \"!:\\resource\\qt\\plugins\\contacts\\mobapicontactspluginsymbian.qtplugin\"" \
+#        "\"$$QT_MOBILITY_BUILD_TREE/plugins/contacts/symbiansim/qmakepluginstubs/mobapicontactspluginsymbiansim.qtplugin\"  - \"!:\\resource\\qt\\plugins\\contacts\\mobapicontactspluginsymbiansim.qtplugin\"" \
+#        "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/symbian/qmakepluginstubs/QtMobilityMultimediaEngine.qtplugin\" - \"!:\\resource\\qt\\plugins\\mediaservice\\QtMobilityMultimediaEngine.qtplugin\"" \
+#        "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/m3u/qmakepluginstubs/m3u.qtplugin\"     - \"!:\\resource\\qt\\plugins\\playlistformats\\m3u.qtplugin\""        
+
+#    symbiancntsim = \
+#        "\"$${EPOCROOT50}epoc32/release/armv5/urel/mobapicontactspluginsymbiansim.dll\" - \"!:\\sys\\bin\\mobapicontactspluginsymbiansim.dll\"" \
+#        "\"$$QT_MOBILITY_BUILD_TREE/plugins/contacts/symbiansim/qmakepluginstubs/mobapicontactspluginsymbiansim.qtplugin\"  - \"!:\\resource\\qt\\plugins\\contacts\\mobapicontactspluginsymbiansim.qtplugin\""
+
+
     qtmobilitydeployment.pkg_postrules += bearer
+#    qtmobilitydeployment.pkg_postrules += contacts
+#    qtmobilitydeployment.pkg_postrules += multimedia
+#    qtmobilitydeployment.pkg_postrules += pluginstubs
+
+#    contains(symbiancntsim_enabled, yes) {
+#        qtmobilitydeployment.pkg_postrules += symbiancntsim
+#    }
     
     qtmobilitydeployment.path = /sys/bin