diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2010-03-09 00:58:23 (GMT) |
|---|---|---|
| committer | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2010-03-09 00:58:23 (GMT) |
| commit | a4ffe2d274cae2510d72d04f67b42f9448282fbd (patch) | |
| tree | 73bc2d655e4f9d449ff51671ecd50f76a929374c /doc/src/snippets/code | |
| parent | 7a5cc73816df5cf65e8a9aaafd750acdac9ca5a3 (diff) | |
| parent | 86354a3896b92b110e5d28cbf894c23ed837f11e (diff) | |
| download | Qt-a4ffe2d274cae2510d72d04f67b42f9448282fbd.zip Qt-a4ffe2d274cae2510d72d04f67b42f9448282fbd.tar.gz Qt-a4ffe2d274cae2510d72d04f67b42f9448282fbd.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging 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] |