diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-07 19:38:10 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-07 19:38:10 (GMT) |
| commit | a197afa76c4b33a0e1d0428895b609bbfd030703 (patch) | |
| tree | fdf2da6df6b0f1f15e37296320a0273168c3e9bf /doc/src/snippets/code | |
| parent | a9e66b3b7a469a8400915f22bb5ae75d60f3eed6 (diff) | |
| parent | 3abdfc7756973f1cff82ded95c728d65e6548d98 (diff) | |
| download | Qt-a197afa76c4b33a0e1d0428895b609bbfd030703.zip Qt-a197afa76c4b33a0e1d0428895b609bbfd030703.tar.gz Qt-a197afa76c4b33a0e1d0428895b609bbfd030703.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Implement support for DEPLOYMENT.display_name in Symbian
Added .flags modifier support for DEPLOYMENT items in Symbian
Make default application deployment removable
Diffstat (limited to 'doc/src/snippets/code')
| -rw-r--r-- | doc/src/snippets/code/doc_src_qmake-manual.qdoc | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/doc/src/snippets/code/doc_src_qmake-manual.qdoc b/doc/src/snippets/code/doc_src_qmake-manual.qdoc index 379d081..4f74e9c 100644 --- a/doc/src/snippets/code/doc_src_qmake-manual.qdoc +++ b/doc/src/snippets/code/doc_src_qmake-manual.qdoc @@ -1014,3 +1014,18 @@ 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] + +//! [155] +default_bin_deployment.flags += FILERUN RUNINSTALL +dep_note.sources = install_note.txt +dep_note.flags = FILETEXT TEXTEXIT +DEPLOYMENT += dep_note +//! [155] + +//! [156] +DEPLOYMENT.display_name = My Qt App +//! [156] |