diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-09 00:21:06 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-09 00:21:06 (GMT) |
| commit | 3d2504305fa39903ab680d7199cb4bb5427167e8 (patch) | |
| tree | 71166564d72a9ccfbfcf6356a994f6e8061834f9 /doc/src/snippets | |
| parent | 198d903fa18d9f1d51615974d71de8236e97c2cd (diff) | |
| parent | 1dab1be81c2f295736f196a9d56ce4facb59fe64 (diff) | |
| download | Qt-3d2504305fa39903ab680d7199cb4bb5427167e8.zip Qt-3d2504305fa39903ab680d7199cb4bb5427167e8.tar.gz Qt-3d2504305fa39903ab680d7199cb4bb5427167e8.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed deployment for symbian/linux-armcc when using shadow builds.
Started using qtmain.lib for all Qt applications, also corelib ones.
Make qmake to pass all UTF-8 characters unchanged through parser.
Implement support for DEPLOYMENT.display_name in Symbian
Added .flags modifier support for DEPLOYMENT items in Symbian
Make default application deployment removable
Allow pkg_prerules and pkg_postrules to be targeted to separate files
Added missing def file symbol.
Revert "Use qtmain.lib to provide entry point for all Symbian applications"
Fixed test after the fix to QT-4077.
Fixed event starvation with pointer events on Symbian.
Diffstat (limited to 'doc/src/snippets')
| -rw-r--r-- | doc/src/snippets/code/doc_src_qmake-manual.qdoc | 20 |
1 files changed, 20 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 8c35c3f..4f74e9c 100644 --- a/doc/src/snippets/code/doc_src_qmake-manual.qdoc +++ b/doc/src/snippets/code/doc_src_qmake-manual.qdoc @@ -1009,3 +1009,23 @@ my_exports = \ "bar.h /epoc32/include/mylib/bar.h" BLD_INF_RULES.prj_exports += my_exports //! [152] + +//! [153] +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] |