Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7

3 files changed, 20 insertions, 27 deletions

diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 4b4dab5c73..899ff49bfc 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -874,9 +874,10 @@ If the installation fails, please make sure that there is
 no previously installed version of Qt on the phone.
 
 Qt requires some dependent packages to be installed on the device,
-they are shipped in the Symbian SDK and can be installed using the
-runonphone tool as well.
-The packages can be found in the EPOCROOT at the following locations;
+which can be installed using the runonphone tool as well. One is
+the \c{sqlite3.sis}, which is included in the Qt distribution, while
+the others are shipped with the Symbian SDK. The required packages
+can be found from the following locations:
 
 \snippet doc/src/snippets/code/doc_src_installation.qdoc 50
 
@@ -1273,10 +1274,18 @@ We hope you will enjoy using Qt.
            in this release.
     \endlist
 
-    Running Qt on real device requires the Open C to be installed on the device.
-    The Open C installation packages are embedded into \c{qt_installer.sis}, which is included in
-    Qt for Symbian binary package. If you are building Qt from scratch, you can find the
-    required packages in the Symbian SDK where you installed Open C/C++:
+    Running Qt on real device requires the Open C and sqlite3 to be installed on the device.
+    These installation packages are embedded into \c{qt_installer.sis}, which is included in
+    Qt for Symbian binary package.
+
+    If you are building Qt from scratch, you can find the sqlite3 package from
+    under your Qt installation:
+
+    \list
+        \o \c{src\s60installs\sqlite3.sis}
+    \endlist
+
+    The Open C packages you can find in the Symbian SDK where you installed Open C/C++:
     \list
         \o \c{nokia_plugin\openc\s60opencsis\pips_s60_<version>.sis}
         \o \c{nokia_plugin\openc\s60opencsis\openc_ssl_s60_<version>.sis}
diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc
index 0374320026..1a87566741 100644
--- a/doc/src/snippets/code/doc_src_installation.qdoc
+++ b/doc/src/snippets/code/doc_src_installation.qdoc
@@ -328,9 +328,10 @@ runonphone -s myapp.sis myapp.exe
 //! [49]
 
 //! [50]
-nokia_plugin/openc/s60opencsis/openc_ssl_s60_1_6_ss.sis
-nokia_plugin/openc/s60opencsis/pips_s60_1_6_ss.sis
-nokia_plugin/opencpp/s60opencppsis/stdcpp_s60_1_6_ss.sis
+src/s60installs/sqlite3.sis
+$EPOCROOT/nokia_plugin/openc/s60opencsis/openc_ssl_s60_1_6_ss.sis
+$EPOCROOT/nokia_plugin/openc/s60opencsis/pips_s60_1_6_ss.sis
+$EPOCROOT/nokia_plugin/opencpp/s60opencppsis/stdcpp_s60_1_6_ss.sis
 //! [50]
 
 
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index 98a9ea904e..1e5ce0ff4f 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -11,23 +11,6 @@ symbian: {
 
     isEmpty(QT_LIBINFIX) {
         TARGET.UID3 = 0x2001E61C
-
-        # Sqlite3 is expected to be already found on phone if infixed configuration is built.
-        # It is also expected that devices newer than those based on S60 5.0 all have sqlite3.dll.
-        contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
-            BLD_INF_RULES.prj_exports += \
-                "sqlite3.sis /epoc32/data/qt/sis/sqlite3.sis"
-            symbian-abld|symbian-sbsv2 {
-                sqlitedeployment = \
-                    "; Deploy sqlite onto phone that does not have it already" \
-                    "@\"$${EPOCROOT}epoc32/data/qt/sis/sqlite3.sis\", (0x2002af5f)"
-            } else {
-                sqlitedeployment = \
-                    "; Deploy sqlite onto phone that does not have it already" \
-                    "@\"$${PWD}/sqlite3.sis\", (0x2002af5f)"
-            }
-            qtlibraries.pkg_postrules += sqlitedeployment
-        }
     } else {
         # Always use experimental UID for infixed configuration to avoid UID clash
         TARGET.UID3 = 0xE001E61C