summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-02-17 11:12:08 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-02-17 11:12:08 (GMT)
commit70dd3d2dcde08530a4a6ab62675406e03c8981f0 (patch)
tree882da5790f797684b7da674604a3c5ab634efe28 /doc/src/snippets
parent6e323d672ce679b253eb1d49bac1669349067a7b (diff)
parent924bcf1ccd9d25484fda8b8d68b8de7744a4693e (diff)
downloadQt-70dd3d2dcde08530a4a6ab62675406e03c8981f0.zip
Qt-70dd3d2dcde08530a4a6ab62675406e03c8981f0.tar.gz
Qt-70dd3d2dcde08530a4a6ab62675406e03c8981f0.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove sqlite3.sis from qt.sis.
Diffstat (limited to 'doc/src/snippets')
-rw-r--r--doc/src/snippets/code/doc_src_installation.qdoc7
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc
index 0374320..1a87566 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]