diff -r 93b982ccede2 -r 5daf16870df6 src/s60installs/qt.pkg
--- a/src/s60installs/qt.pkg	Mon Jun 21 22:38:13 2010 +0100
+++ b/src/s60installs/qt.pkg	Thu Jul 22 16:41:55 2010 +0100
@@ -1,8 +1,12 @@
+; Qt_template.pkg generated by qmake at 2009-11-16T11:44:16
+; This file is generated by qmake and should not be modified by the user
+;
+
 ; Language
 &EN
 
 ; SIS header: name, uid, version
-#{"Qt"},(0x2001E61C),4,6,3,TYPE=SA,RU,NR
+#{"Qt"},(0x2001E61C),4,6,2,TYPE=SA,RU
 
 ; Manual PKG pre-rules from PRO files
 ; Default HW/platform dependencies
@@ -28,36 +32,37 @@
 "/epoc32/release/armv5/urel/QtTest.dll"    - "!:\sys\bin\QtTest.dll"
 "/epoc32/release/armv5/urel/QtSql.dll"    - "!:\sys\bin\QtSql.dll"
 "/epoc32/release/armv5/urel/QtSvg.dll"    - "!:\sys\bin\QtSvg.dll"
+"/epoc32/release/armv5/urel/QtScript.dll"    - "!:\sys\bin\QtScript.dll"
+"/epoc32/release/armv5/urel/QtWebKit.dll"    - "!:\sys\bin\QtWebKit.dll"
+"/epoc32/release/armv5/urel/QtOpenVG.dll"    - "!:\sys\bin\QtOpenVG.dll"
 "/epoc32/release/armv5/urel/phonon.dll"    - "!:\sys\bin\phonon.dll"
-"/epoc32/release/armv5/urel/QtScript.dll"    - "!:\sys\bin\QtScript.dll"
+"/epoc32/release/armv5/urel/QtMultimedia.dll"    - "!:\sys\bin\QtMultimedia.dll"
 "/epoc32/release/armv5/urel/QtXmlPatterns.dll"    - "!:\sys\bin\QtXmlPatterns.dll"
-"/epoc32/release/armv5/urel/QtOpenVG.dll"    - "!:\sys\bin\QtOpenVG.dll"
-"/epoc32/release/armv5/urel/QtMultimedia.dll"    - "!:\sys\bin\QtMultimedia.dll"
 
 "/epoc32/release/armv5/urel/qjpeg.dll"    - "!:\sys\bin\qjpeg.dll"
-"/sf/mw/qt/src/s60installs/qmakepluginstubs/qjpeg.qtplugin"    - "!:\resource\qt\plugins\imageformats\qjpeg.qtplugin"
+"/epoc32/data/z/resource/qt/plugins/imageformats/qjpeg.qtplugin"    - "!:\resource\qt\plugins\imageformats\qjpeg.qtplugin"
 "/epoc32/release/armv5/urel/qgif.dll"    - "!:\sys\bin\qgif.dll"
-"/sf/mw/qt/src/s60installs/qmakepluginstubs/qgif.qtplugin"    - "!:\resource\qt\plugins\imageformats\qgif.qtplugin"
+"/epoc32/data/z/resource/qt/plugins/imageformats/qgif.qtplugin"    - "!:\resource\qt\plugins\imageformats\qgif.qtplugin"
 "/epoc32/release/armv5/urel/qmng.dll"    - "!:\sys\bin\qmng.dll"
-"/sf/mw/qt/src/s60installs/qmakepluginstubs/qmng.qtplugin"    - "!:\resource\qt\plugins\imageformats\qmng.qtplugin"
+"/epoc32/data/z/resource/qt/plugins/imageformats/qmng.qtplugin"    - "!:\resource\qt\plugins\imageformats\qmng.qtplugin"
 "/epoc32/release/armv5/urel/qtiff.dll"    - "!:\sys\bin\qtiff.dll"
-"/sf/mw/qt/src/s60installs/qmakepluginstubs/qtiff.qtplugin"    - "!:\resource\qt\plugins\imageformats\qtiff.qtplugin"
+"/epoc32/data/z/resource/qt/plugins/imageformats/qtiff.qtplugin"    - "!:\resource\qt\plugins\imageformats\qtiff.qtplugin"
 "/epoc32/release/armv5/urel/qico.dll"    - "!:\sys\bin\qico.dll"
-"/sf/mw/qt/src/s60installs/qmakepluginstubs/qico.qtplugin"    - "!:\resource\qt\plugins\imageformats\qico.qtplugin"
+"/epoc32/data/z/resource/qt/plugins/imageformats/qico.qtplugin"    - "!:\resource\qt\plugins\imageformats\qico.qtplugin"
 "/epoc32/release/armv5/urel/qsvg.dll"    - "!:\sys\bin\qsvg.dll"
-"/sf/mw/qt/src/s60installs/qmakepluginstubs/qsvg.qtplugin"    - "!:\resource\qt\plugins\imageformats\qsvg.qtplugin"
+"/epoc32/data/z/resource/qt/plugins/imageformats/qsvg.qtplugin"    - "!:\resource\qt\plugins\imageformats\qsvg.qtplugin"
 "/epoc32/release/armv5/urel/qcncodecs.dll"    - "!:\sys\bin\qcncodecs.dll"
-"/sf/mw/qt/src/s60installs/qmakepluginstubs/qcncodecs.qtplugin"    - "!:\resource\qt\plugins\codecs\qcncodecs.qtplugin"
+"/epoc32/data/z/resource/qt/plugins/codecs/qcncodecs.qtplugin"    - "!:\resource\qt\plugins\codecs\qcncodecs.qtplugin"
 "/epoc32/release/armv5/urel/qjpcodecs.dll"    - "!:\sys\bin\qjpcodecs.dll"
-"/sf/mw/qt/src/s60installs/qmakepluginstubs/qjpcodecs.qtplugin"    - "!:\resource\qt\plugins\codecs\qjpcodecs.qtplugin"
+"/epoc32/data/z/resource/qt/plugins/codecs/qjpcodecs.qtplugin"    - "!:\resource\qt\plugins\codecs\qjpcodecs.qtplugin"
 "/epoc32/release/armv5/urel/qtwcodecs.dll"    - "!:\sys\bin\qtwcodecs.dll"
-"/sf/mw/qt/src/s60installs/qmakepluginstubs/qtwcodecs.qtplugin"    - "!:\resource\qt\plugins\codecs\qtwcodecs.qtplugin"
+"/epoc32/data/z/resource/qt/plugins/codecs/qtwcodecs.qtplugin"    - "!:\resource\qt\plugins\codecs\qtwcodecs.qtplugin"
 "/epoc32/release/armv5/urel/qkrcodecs.dll"    - "!:\sys\bin\qkrcodecs.dll"
-"/sf/mw/qt/src/s60installs/qmakepluginstubs/qkrcodecs.qtplugin"    - "!:\resource\qt\plugins\codecs\qkrcodecs.qtplugin"
+"/epoc32/data/z/resource/qt/plugins/codecs/qkrcodecs.qtplugin"    - "!:\resource\qt\plugins\codecs\qkrcodecs.qtplugin"
 "/epoc32/release/armv5/urel/qvggraphicssystem.dll"    - "!:\sys\bin\qvggraphicssystem.dll"
-"/sf/mw/qt/src/s60installs/qmakepluginstubs/qvggraphicssystem.qtplugin"    - "!:\resource\qt\plugins\graphicssystems\qvggraphicssystem.qtplugin"
+"/epoc32/data/z/resource/qt/plugins/graphicssystems/qvggraphicssystem.qtplugin"    - "!:\resource\qt\plugins\graphicssystems\qvggraphicssystem.qtplugin"
 "/epoc32/release/armv5/urel/qsvgicon.dll"    - "!:\sys\bin\qsvgicon.dll"
-"/sf/mw/qt/src/s60installs/qmakepluginstubs/qsvgicon.qtplugin"    - "!:\resource\qt\plugins\iconengines\qsvgicon.qtplugin"
+"/epoc32/data/z/resource/qt/plugins/iconengines/qsvgicon.qtplugin"    - "!:\resource\qt\plugins\iconengines\qsvgicon.qtplugin"
 
 ; Manual PKG post-rules from PRO files
 IF package(0x1028315F)
@@ -69,3 +74,8 @@
 ELSE
  "/epoc32/release/armv5/urel/qts60plugin_5_0.dll" - "!:\sys\bin\qts60plugin_5_0.dll"
 ENDIF
+
+; 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")
+"/epoc32/release/armv5/urel/sqlite3.dll" - "!:\sys\bin\sqlite3.dll"
+ENDIF