--- a/src/s60installs/s60installs.pro	Tue Feb 02 00:43:10 2010 +0200
+++ b/src/s60installs/s60installs.pro	Fri Feb 19 23:40:16 2010 +0200
@@ -35,10 +35,8 @@
     qtlibraries.pkg_postrules += qts60plugindeployment
 
     sqlitedeployment = \
-        "; Deploy sqlite onto phone that does not have it (this should be replaced with embedded sis file when available)" \
-        "IF NOT package(0x2002533b) " \
-        "\"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/sqlite3.dll\" - \"c:\\sys\\bin\\sqlite3.dll\"" \
-        "ENDIF"
+        "; Deploy sqlite onto phone that does not have it already" \
+        "@\"$$PWD/sqlite3.sis\", (0x2002af5f)"
     qtlibraries.pkg_postrules += sqlitedeployment
 
     qtlibraries.path = c:/sys/bin
@@ -54,7 +52,7 @@
 
     qtlibraries.pkg_prerules = vendorinfo
     qtlibraries.pkg_prerules += "; Dependencies of Qt libraries"
-    
+
     # Comment the following dependencies out because it is not needed in MCL
     
     #qtlibraries.pkg_prerules += "(0x20013851), 1, 5, 1, {\"PIPS Installer\"}"
@@ -64,6 +62,7 @@
     #contains(CONFIG, stl) {
     #    qtlibraries.pkg_prerules += "(0x2000F866), 1, 0, 0, {\"Standard C++ Library Common\"}"
     #}
+    #qtlibraries.pkg_prerules += "(0x2002af5f), 0, 5, 0, {\"sqlite3\"}"
 
     !contains(QT_CONFIG, no-jpeg): imageformats_plugins.sources += qjpeg.dll
     !contains(QT_CONFIG, no-gif):  imageformats_plugins.sources += qgif.dll
@@ -108,10 +107,6 @@
         qtlibraries.sources += QtDeclarative.dll
     }
 
-    contains(QT_CONFIG, webkit): {
-        qtlibraries.sources += QtWebKit.dll
-    }
-
     graphicssystems_plugins.path = c:$$QT_PLUGINS_BASE_DIR/graphicssystems
     contains(QT_CONFIG, openvg) {
         qtlibraries.sources += QtOpenVG.dll
@@ -119,7 +114,12 @@
     }
 
     #BLD_INF_RULES.prj_exports += "qt.iby $$CORE_MW_LAYER_IBY_EXPORT_PATH(qt.iby)"
-    #:QTP:QTPROD-220: Qt Examples should be exported to tools-layer
+    #:QTP:QTPROD-220: Qt Examples should be exported to ROFS3
     #BLD_INF_RULES.prj_exports += "qtdemoapps.iby $$CUSTOMER_VARIANT_APP_LAYER_IBY_EXPORT_PATH(qtdemoapps.iby)"
+    PLUGIN_STUBS = $$files(qmakepluginstubs/*)
+    for(STUB, PLUGIN_STUBS) {
+        STUB_FILENAME = $$basename(STUB)
+        BLD_INF_RULES.prj_exports += "qmakepluginstubs/$${STUB_FILENAME} /epoc32/data/qt/qtlibspluginstubs/$${STUB_FILENAME}"
+    }
 }