diff options
| author | Bill King <bill.king@nokia.com> | 2010-03-02 05:22:44 (GMT) |
|---|---|---|
| committer | Bill King <bill.king@nokia.com> | 2010-03-02 05:22:44 (GMT) |
| commit | 618ca0234b626fc454f74b3d98bb8f82927c16e8 (patch) | |
| tree | 1673e3d601d20e5b6656183d21d1274fc05b2301 /doc/src/snippets/code | |
| parent | c55a99965d8c08d5f924d49db4fe4aa49df80961 (diff) | |
| parent | 6f20bd49782045897b5cb067aa42cc2e0d955770 (diff) | |
| download | Qt-618ca0234b626fc454f74b3d98bb8f82927c16e8.zip Qt-618ca0234b626fc454f74b3d98bb8f82927c16e8.tar.gz Qt-618ca0234b626fc454f74b3d98bb8f82927c16e8.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-sql-team into 4.6
Diffstat (limited to 'doc/src/snippets/code')
| -rw-r--r-- | doc/src/snippets/code/doc_src_qmake-manual.qdoc | 27 |
1 files changed, 27 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..e8c00d3 100644 --- a/doc/src/snippets/code/doc_src_qmake-manual.qdoc +++ b/doc/src/snippets/code/doc_src_qmake-manual.qdoc @@ -969,3 +969,30 @@ 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] + +//! [149] +SUBDIRS += my_executable my_library +my_executable.subdir = app +my_executable.depends = my_library +my_library.subdir = lib +//! [149] + +//! [150] +symbian { + SUBDIRS += emulator_dll + emulator_dll.condition = WINSCW +} +//! [150] |