summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets
diff options
context:
space:
mode:
authorA-Team <ateam@pad.test.qt.nokia.com>2010-11-09 23:00:28 (GMT)
committerA-Team <ateam@pad.test.qt.nokia.com>2010-11-09 23:00:28 (GMT)
commitd7da33a914a7e84ebf38cbb3244aac936838ecb1 (patch)
tree2f275e9d39c536ff3584ae4ba671a422b86cb36b /doc/src/snippets
parent4ddf22fdbf9da5f05f1af8c8611db268419de42d (diff)
parent894e3c41af88a0bbfa2fc63fe3872ed27ab7a3dc (diff)
downloadQt-d7da33a914a7e84ebf38cbb3244aac936838ecb1.zip
Qt-d7da33a914a7e84ebf38cbb3244aac936838ecb1.tar.gz
Qt-d7da33a914a7e84ebf38cbb3244aac936838ecb1.tar.bz2
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'doc/src/snippets')
-rw-r--r--doc/src/snippets/code/doc_src_qmake-manual.qdoc20
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]