diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-02-26 13:24:11 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-02-26 13:24:11 (GMT) |
| commit | b78012c855a8b00fa0d100cd0cf6c8de024dfa69 (patch) | |
| tree | 75cd20ff9e068c04996daf0d4aed4e15b49b5992 /doc/src/snippets | |
| parent | 5e9382c018e231c5e2ef49dd8a38eaff535b9837 (diff) | |
| parent | 7ca00ed67cb18fb858e1e89cec21b3db696fa923 (diff) | |
| download | Qt-b78012c855a8b00fa0d100cd0cf6c8de024dfa69.zip Qt-b78012c855a8b00fa0d100cd0cf6c8de024dfa69.tar.gz Qt-b78012c855a8b00fa0d100cd0cf6c8de024dfa69.tar.bz2 | |
Merge branch '4.6'
Conflicts:
mkspecs/common/symbian/symbian.conf
Diffstat (limited to 'doc/src/snippets')
| -rw-r--r-- | doc/src/snippets/code/doc_src_qmake-manual.qdoc | 13 |
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] |