summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorA-Team <ateam@pad.test.qt.nokia.com>2010-12-02 23:00:15 (GMT)
committerA-Team <ateam@pad.test.qt.nokia.com>2010-12-02 23:00:15 (GMT)
commitd70dbc6050404787c15be814054ab251cfe09db7 (patch)
treef1e5517fbe3620a23cb3a18319889b374f371a93 /doc
parentaeecea2fe853f1b10e84ac004de8b3461b295925 (diff)
parent1d38ef4f4f9c0ec03998ab4d9998a1989f5385ab (diff)
downloadQt-d70dbc6050404787c15be814054ab251cfe09db7.zip
Qt-d70dbc6050404787c15be814054ab251cfe09db7.tar.gz
Qt-d70dbc6050404787c15be814054ab251cfe09db7.tar.bz2
Merge branch '4.7-upstream' into 4.7-doc
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