summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-10 01:34:42 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-10 01:34:42 (GMT)
commitf57a2756ebfb48c2fad94c0c319fa181d2af4dfd (patch)
tree6cff930efe7d988001d514802a35e79a943064df /doc/src
parentbd145e708d97ffb5a68bf53bbdf04b8df8ea4a9b (diff)
parentb0c972dfd208411086b53ee2c2b0594ade3e2d10 (diff)
downloadQt-f57a2756ebfb48c2fad94c0c319fa181d2af4dfd.zip
Qt-f57a2756ebfb48c2fad94c0c319fa181d2af4dfd.tar.gz
Qt-f57a2756ebfb48c2fad94c0c319fa181d2af4dfd.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Add the download URI for smart installer package to documentation Catch up symbianutils to creator 3efdb87682a5785bac7b90f9f9a8bb819a1cb053 rename trk -> symbianutils Catch up TRK library to creator f2b3e9f2dfbc580389b9b683a3e46e5a8422f55b Fixed defect in handling of expose events for Symbian Added qwidget test case which displays a native child widget Fix tst_QAbstractItemView::task250754_fontChange and tst_QAbstractItemView::QTBUG6407_extendedSelection for Symbian & 5800
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/deployment/deployment.qdoc7
-rw-r--r--doc/src/platforms/symbian-introduction.qdoc11
2 files changed, 16 insertions, 2 deletions
diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc
index ecd6b11..bf0bc74 100644
--- a/doc/src/deployment/deployment.qdoc
+++ b/doc/src/deployment/deployment.qdoc
@@ -1557,7 +1557,12 @@
\snippet doc/src/snippets/code/doc_src_deployment.qdoc 58
If everything compiled and linked without any errors, we are now ready to create
- an application installation package (\c wiggly_installer.sis):
+ an application installation package (\c wiggly_installer.sis).
+
+ If you haven't done so already, download the latest release of the Smart Installer
+ from \l{http://get.qt.nokia.com/nokiasmartinstaller/}, and install it on top of the Qt package
+
+ Then use this command to create the installer sis package:
\snippet doc/src/snippets/code/doc_src_deployment.qdoc 59
diff --git a/doc/src/platforms/symbian-introduction.qdoc b/doc/src/platforms/symbian-introduction.qdoc
index 94075f5..5cebee3 100644
--- a/doc/src/platforms/symbian-introduction.qdoc
+++ b/doc/src/platforms/symbian-introduction.qdoc
@@ -127,7 +127,8 @@
\row \o \c run \o Run the application on the emulator.
\row \o \c runonphone \o Run the application on a device.
\row \o \c sis \o Create signed \c .sis file for project.
- \row \o \c installer_sis \o Create signed smart installer \c .sis file for project.
+ \row \o \c installer_sis \o Create signed \l{Smart Installer}{smart installer}
+ \c .sis file for project.
Smart installer will attempt to download
missing dependencies in addition to
just installing the application.
@@ -141,6 +142,14 @@
To work on your project in Carbide, simply import the \c .pro file
by right clicking on the project explorer and executing "Import...".
+ \section2 Smart Installer
+
+ The Smart Installer makes sure that deployed applications have all the Qt dependencies
+ they need to run on a device.
+
+ Download the latest release of the Smart Installer from \l{http://get.qt.nokia.com/nokiasmartinstaller/},
+ and install it on top of the Qt package.
+
\section1 Installing your own applications
To install your own applications on hardware, you need a signed \c .sis file.