diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-01 09:36:18 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-01 09:36:18 (GMT) |
| commit | 8bbb28f2d5f6a53f94f23f3ac86f5270143795ab (patch) | |
| tree | 813c9d5e20af13d6f58d19262c31ee6fd475608c /doc/src/snippets/code | |
| parent | 901bee3cbad3fcf52465d72cd257b4dd87e5b049 (diff) | |
| parent | 3d50a8049b20e01b8a2cb9b954b14302dc6144c6 (diff) | |
| download | Qt-8bbb28f2d5f6a53f94f23f3ac86f5270143795ab.zip Qt-8bbb28f2d5f6a53f94f23f3ac86f5270143795ab.tar.gz Qt-8bbb28f2d5f6a53f94f23f3ac86f5270143795ab.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Added .condition modifier to SUBDIRS.
Added orientation change support for show/showNormal widgets in S60.
Added fullscreen support to softkeys in Symbian.
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] |