summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code/doc_src_qmake-manual.qdoc
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2010-03-01 11:24:27 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2010-03-01 11:24:27 (GMT)
commit4cc9d165663728cb08b3269ea88a584410b79b70 (patch)
treed1e1993be1d929a00478be0629d9fec910dd86ca /doc/src/snippets/code/doc_src_qmake-manual.qdoc
parent3a4dc08d08ce0388dd183a24923871e3e03ba531 (diff)
parent049330b4a54836f227a0e179082527a5272e868d (diff)
downloadQt-4cc9d165663728cb08b3269ea88a584410b79b70.zip
Qt-4cc9d165663728cb08b3269ea88a584410b79b70.tar.gz
Qt-4cc9d165663728cb08b3269ea88a584410b79b70.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'doc/src/snippets/code/doc_src_qmake-manual.qdoc')
-rw-r--r--doc/src/snippets/code/doc_src_qmake-manual.qdoc13
1 files changed, 13 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 a48b53f..5a04420 100644
--- a/doc/src/snippets/code/doc_src_qmake-manual.qdoc
+++ b/doc/src/snippets/code/doc_src_qmake-manual.qdoc
@@ -969,3 +969,16 @@ DEPLOYMENT.installer_header = 0x12345678
//! [147]
DEPLOYMENT.installer_header = "$${LITERAL_HASH}{\"My Application Installer\"},(0x12345678),1,0,0"
//! [147]
+
+//! [148]
+# Set conditional libraries
+LIB.MARM = "LIBRARY myarm.lib"
+LIB.WINSCW = "LIBRARY mywinscw.lib"
+LIB.default = "LIBRARY mydefault.lib"
+
+# Add the conditional MMP rules
+MYCONDITIONS = MARM WINSCW
+MYVARIABLES = LIB
+
+addMMPRules(MYCONDITIONS, MYVARIABLES)
+//! [148]