diff options
author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-09 23:00:18 (GMT) |
---|---|---|
committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-09 23:00:18 (GMT) |
commit | 7b14625eb9a85406e7851fa1c37c3bfa2acec3cc (patch) | |
tree | 829db882717162d73e06451855032c87e16bc41c /doc/src/snippets/code | |
parent | 0870d766b9e302081ba31a9c8f6dfa3a1e8c1e52 (diff) | |
parent | 894e3c41af88a0bbfa2fc63fe3872ed27ab7a3dc (diff) | |
download | Qt-7b14625eb9a85406e7851fa1c37c3bfa2acec3cc.zip Qt-7b14625eb9a85406e7851fa1c37c3bfa2acec3cc.tar.gz Qt-7b14625eb9a85406e7851fa1c37c3bfa2acec3cc.tar.bz2 |
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'doc/src/snippets/code')
-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] |