diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-03-08 01:43:00 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-03-08 01:43:00 (GMT) |
| commit | 56768688cc49c2dd2234598b41ebbfd046937ac5 (patch) | |
| tree | 029ced5da670e8b64901827508502454e0a167aa /doc/src/snippets/code | |
| parent | 038f6fc10092da1414fd2efff353671dbf862995 (diff) | |
| parent | 9bc81769eb6ebc9bd62fe3c1d86e67ddccbed8b6 (diff) | |
| download | Qt-56768688cc49c2dd2234598b41ebbfd046937ac5.zip Qt-56768688cc49c2dd2234598b41ebbfd046937ac5.tar.gz Qt-56768688cc49c2dd2234598b41ebbfd046937ac5.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'doc/src/snippets/code')
| -rw-r--r-- | doc/src/snippets/code/doc_src_qmake-manual.qdoc | 14 |
1 files changed, 14 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 5a04420..e8c00d3 100644 --- a/doc/src/snippets/code/doc_src_qmake-manual.qdoc +++ b/doc/src/snippets/code/doc_src_qmake-manual.qdoc @@ -982,3 +982,17 @@ 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] |