diff options
| author | axis <qt-info@nokia.com> | 2010-02-12 14:55:11 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-12 14:55:11 (GMT) |
| commit | 0a3fef019630a7a49fdca28b3e507400bf4dec19 (patch) | |
| tree | 50fbc7b6303787fa3ef9eac363aa6fe53397c5e7 /doc/src/development | |
| parent | 12b5471062a52f6745f4309568b4c27c5e12d91f (diff) | |
| parent | 01245bcabf97dfdfdd23a2ec075b8de3e78bdeb2 (diff) | |
| download | Qt-0a3fef019630a7a49fdca28b3e507400bf4dec19.zip Qt-0a3fef019630a7a49fdca28b3e507400bf4dec19.tar.gz Qt-0a3fef019630a7a49fdca28b3e507400bf4dec19.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/makefile.cpp
qmake/generators/symbian/symmake.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
Conflict resolution was heavily based on manual application of commit
9cc4ae77a73bd28ff495f36f26dd87c78b76b976.
Diffstat (limited to 'doc/src/development')
| -rw-r--r-- | doc/src/development/qmake-manual.qdoc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc index 0172cf2..e66cd71 100644 --- a/doc/src/development/qmake-manual.qdoc +++ b/doc/src/development/qmake-manual.qdoc @@ -1431,6 +1431,18 @@ is the application private directory on the drive it is installed to. \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 141 + On the Symbian platform, you can use \c{DEPLOYMENT.installer_header} + variable to generate smart installer wrapper for your application. + If you specify just UID of the installer package as the value, then + installer package name and version will be autogenerated: + + \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 146 + + If autogenerated values are not suitable, you can also specify the sis + header yourself using this variable: + + \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 147 + \target DEPLOYMENT_PLUGIN \section1 DEPLOYMENT_PLUGIN |