summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2010-12-02 23:00:14 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2010-12-02 23:00:14 (GMT)
commit1c6fb3c942a9a079a7fa3d157f66230818f22b96 (patch)
treed91fcc31ff048a2f8f7e1055977e0206cf5451cb /doc
parentdfe2b6b4fb53e973aa455e1fe214925dfe03de9f (diff)
parent1d38ef4f4f9c0ec03998ab4d9998a1989f5385ab (diff)
downloadQt-1c6fb3c942a9a079a7fa3d157f66230818f22b96.zip
Qt-1c6fb3c942a9a079a7fa3d157f66230818f22b96.tar.gz
Qt-1c6fb3c942a9a079a7fa3d157f66230818f22b96.tar.bz2
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'doc')
-rw-r--r--doc/src/platforms/symbian-introduction.qdoc9
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/src/platforms/symbian-introduction.qdoc b/doc/src/platforms/symbian-introduction.qdoc
index 9da94c4..cce2be3 100644
--- a/doc/src/platforms/symbian-introduction.qdoc
+++ b/doc/src/platforms/symbian-introduction.qdoc
@@ -144,8 +144,17 @@
Smart installer will attempt to download
missing dependencies in addition to
just installing the application.
+ Note: The application \c .sis contained in smart installer \c .sis
+ will be recreated and signed with same certificates as
+ smart installer \c .sis.
+ \row \o \c ok_installer_sis \o Otherwise similar to \c installer_sis target, except
+ the application sis will not be recreated. This is useful
+ when application \c .sis needs to be separately signed before
+ including it into smart installer \c .sis.
\row \o \c unsigned_installer_sis \o Create unsigned \l{Smart Installer}{smart installer}
\c .sis file for project.
+ Note: The application \c .sis contained in smart installer
+ \c .sis will also be unsigned.
\row \o \c stub_sis \o Create a stub sis to allow upgradability of projects
that are deployed in ROM
\endtable