diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2010-03-09 01:33:14 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2010-03-09 01:33:14 (GMT) |
| commit | a0cc850f0468af7d4d3c99e9c2bc418f064ea7f8 (patch) | |
| tree | afad1c58972bf12f15250cb4fc426d72ba9e5af8 /doc/src/snippets/code | |
| parent | 0b4d84e3980e415df3078e97d44ee5216fbbff07 (diff) | |
| parent | 5fac3f48019263e8544edffb2dd053238d8670bf (diff) | |
| download | Qt-a0cc850f0468af7d4d3c99e9c2bc418f064ea7f8.zip Qt-a0cc850f0468af7d4d3c99e9c2bc418f064ea7f8.tar.gz Qt-a0cc850f0468af7d4d3c99e9c2bc418f064ea7f8.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] |