diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-11-05 14:45:39 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-11-08 09:51:37 (GMT) |
| commit | 70770a2e4fc7581f56a39f7b8b89dd5782cd29c0 (patch) | |
| tree | 144770f9ffa940b46648c9f47f52b790bd390639 /doc | |
| parent | e8b10f2239a15e8d0ad1b676b7f03d03543efc67 (diff) | |
| download | Qt-70770a2e4fc7581f56a39f7b8b89dd5782cd29c0.zip Qt-70770a2e4fc7581f56a39f7b8b89dd5782cd29c0.tar.gz Qt-70770a2e4fc7581f56a39f7b8b89dd5782cd29c0.tar.bz2 | |
Make default application deployment removable
Default application deployment was hard coded in qmake, so it was
impossible to replace with custom deployment. Now the default deployment
is generated via .prf files and is removable.
Cherry picked to 4.7 branch from master branch as part of QTBUG-15068,
original commit: 494ce0dac35c7ade0ce78589878597a7ca912864
Task-number: QTBUG-15068
Task-number: QTBUG-13367
Reviewed-by: axis
Conflicts:
qmake/generators/symbian/symbiancommon.cpp
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/development/qmake-manual.qdoc | 16 | ||||
| -rw-r--r-- | doc/src/snippets/code/doc_src_qmake-manual.qdoc | 4 |
2 files changed, 20 insertions, 0 deletions
diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc index a520838..278822e 100644 --- a/doc/src/development/qmake-manual.qdoc +++ b/doc/src/development/qmake-manual.qdoc @@ -1458,6 +1458,22 @@ \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 141 + On the Symbian platform, a default deployment is generated for all + application projects. You can modify the autogenerated default + deployment via following \c DEPLOYMENT variable values: + + \list + \o default_bin_deployment - Application executable + \o default_resource_deployment - Application resources, including icon + \o default_reg_deployment - Application registration file + \endlist + + For example: + + \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 154 + + This will entirely remove the default application deployment. + 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 diff --git a/doc/src/snippets/code/doc_src_qmake-manual.qdoc b/doc/src/snippets/code/doc_src_qmake-manual.qdoc index 379d081..20d8d45 100644 --- a/doc/src/snippets/code/doc_src_qmake-manual.qdoc +++ b/doc/src/snippets/code/doc_src_qmake-manual.qdoc @@ -1014,3 +1014,7 @@ BLD_INF_RULES.prj_exports += my_exports my_note.pkg_postrules.installer = "\"myinstallnote.txt\" - \"\", FILETEXT, TEXTCONTINUE" DEPLOYMENT += my_note //! [153] + +//! [154] +DEPLOYMENT -= default_bin_deployment default_resource_deployment default_reg_deployment +//! [154] |