diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-03-02 05:44:23 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-03-02 05:44:23 (GMT) |
| commit | 2c6de1ce1489668253b7d3a5df3f2194fbd1bee7 (patch) | |
| tree | 3e4298cdb45f9b60ac9b7bb27b5ec3bdbd540b2f /doc/src/snippets/code/doc_src_qmake-manual.qdoc | |
| parent | d042a00b5828961e1e1fa82017717b5f72dde9ef (diff) | |
| parent | 82991e40afd46f91de42dec048df705441b6b0cf (diff) | |
| download | Qt-2c6de1ce1489668253b7d3a5df3f2194fbd1bee7.zip Qt-2c6de1ce1489668253b7d3a5df3f2194fbd1bee7.tar.gz Qt-2c6de1ce1489668253b7d3a5df3f2194fbd1bee7.tar.bz2 | |
Merge remote branch 'staging/4.7' into HEAD
Conflicts:
src/plugins/bearer/corewlan/qcorewlanengine.mm
Diffstat (limited to 'doc/src/snippets/code/doc_src_qmake-manual.qdoc')
| -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] |