--- a/src/s60installs/s60installs.pro	Tue Jan 26 12:42:25 2010 +0200
+++ b/src/s60installs/s60installs.pro	Tue Feb 02 00:43:10 2010 +0200
@@ -12,7 +12,7 @@
     VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
 
     qtresources.sources = $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/s60main.rsc
-    qtresources.path = $$APP_RESOURCE_DIR
+    qtresources.path = c:$$APP_RESOURCE_DIR
 
     qtlibraries.sources = \
         QtCore.dll \
@@ -24,24 +24,24 @@
 
     qts60plugindeployment = \
         "IF package(0x1028315F)" \
-        "   \"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/qts60plugin_5_0.dll\" - \"!:\\sys\\bin\\qts60plugin_5_0.dll\"" \
+        "   \"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/qts60plugin_5_0.dll\" - \"c:\\sys\\bin\\qts60plugin_5_0.dll\"" \
         "ELSEIF package(0x102752AE)" \
-        "   \"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/qts60plugin_3_2.dll\" - \"!:\\sys\\bin\\qts60plugin_3_2.dll\"" \
+        "   \"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/qts60plugin_3_2.dll\" - \"c:\\sys\\bin\\qts60plugin_3_2.dll\"" \
         "ELSEIF package(0x102032BE)" \
-        "   \"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/qts60plugin_3_1.dll\" - \"!:\\sys\\bin\\qts60plugin_3_1.dll\"" \
+        "   \"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/qts60plugin_3_1.dll\" - \"c:\\sys\\bin\\qts60plugin_3_1.dll\"" \
         "ELSE" \
-        "   \"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/qts60plugin_5_0.dll\" - \"!:\\sys\\bin\\qts60plugin_5_0.dll\"" \
+        "   \"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/qts60plugin_5_0.dll\" - \"c:\\sys\\bin\\qts60plugin_5_0.dll\"" \
         "ENDIF"
     qtlibraries.pkg_postrules += qts60plugindeployment
 
     sqlitedeployment = \
-        "; EXISTS statement does not resolve !. Lets check the most common drives" \
-        "IF NOT EXISTS(\"c:\\sys\\bin\\sqlite3.dll\") AND NOT EXISTS(\"e:\\sys\\bin\\sqlite3.dll\") AND NOT EXISTS(\"z:\\sys\\bin\\sqlite3.dll\")" \
-        "\"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/sqlite3.dll\" - \"!:\\sys\\bin\\sqlite3.dll\"" \
+        "; 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"
     qtlibraries.pkg_postrules += sqlitedeployment
 
-    qtlibraries.path = /sys/bin
+    qtlibraries.path = c:/sys/bin
 
     vendorinfo = \
         "; Localised Vendor name" \
@@ -70,15 +70,15 @@
     !contains(QT_CONFIG, no-mng):  imageformats_plugins.sources += qmng.dll
     !contains(QT_CONFIG, no-tiff): imageformats_plugins.sources += qtiff.dll
     !contains(QT_CONFIG, no-ico):  imageformats_plugins.sources += qico.dll
-    imageformats_plugins.path = $$QT_PLUGINS_BASE_DIR/imageformats
+    imageformats_plugins.path = c:$$QT_PLUGINS_BASE_DIR/imageformats
 
     codecs_plugins.sources = qcncodecs.dll qjpcodecs.dll qtwcodecs.dll qkrcodecs.dll
-    codecs_plugins.path = $$QT_PLUGINS_BASE_DIR/codecs
+    codecs_plugins.path = c:$$QT_PLUGINS_BASE_DIR/codecs
 
     contains(QT_CONFIG, phonon-backend) {
         phonon_backend_plugins.sources += phonon_mmf.dll
 
-        phonon_backend_plugins.path = $$QT_PLUGINS_BASE_DIR/phonon_backend
+        phonon_backend_plugins.path = c:$$QT_PLUGINS_BASE_DIR/phonon_backend
         DEPLOYMENT += phonon_backend_plugins
     }
 
@@ -88,23 +88,31 @@
        qtlibraries.sources += QtSvg.dll
        imageformats_plugins.sources += qsvg.dll
        iconengines_plugins.sources = qsvgicon.dll
-       iconengines_plugins.path = $$QT_PLUGINS_BASE_DIR/iconengines
+       iconengines_plugins.path = c:$$QT_PLUGINS_BASE_DIR/iconengines
        DEPLOYMENT += iconengines_plugins
     }
 
     contains(QT_CONFIG, phonon): {
-       qtlibraries.sources += Phonon.dll
+       qtlibraries.sources += phonon.dll
     }
 
     contains(QT_CONFIG, script): {
         qtlibraries.sources += QtScript.dll
     }
 
+    contains(QT_CONFIG, xmlpatterns): {
+       qtlibraries.sources += QtXmlPatterns.dll
+    }
+
+    contains(QT_CONFIG, declarative): {
+        qtlibraries.sources += QtDeclarative.dll
+    }
+
     contains(QT_CONFIG, webkit): {
         qtlibraries.sources += QtWebKit.dll
     }
 
-    graphicssystems_plugins.path = $$QT_PLUGINS_BASE_DIR/graphicssystems
+    graphicssystems_plugins.path = c:$$QT_PLUGINS_BASE_DIR/graphicssystems
     contains(QT_CONFIG, openvg) {
         qtlibraries.sources += QtOpenVG.dll
         graphicssystems_plugins.sources += qvggraphicssystem.dll
@@ -112,5 +120,6 @@
 
     #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
-    #BLD_INF_RULES.prj_exports += "qtdemoapps.iby $$CORE_ADAPT_LAYER_IBY_EXPORT_PATH(core/tools/qtdemoapps.iby)"
+    #BLD_INF_RULES.prj_exports += "qtdemoapps.iby $$CUSTOMER_VARIANT_APP_LAYER_IBY_EXPORT_PATH(qtdemoapps.iby)"
 }
+