summaryrefslogtreecommitdiffstats
path: root/doc/src/development/qmake-manual.qdoc
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-03-11 09:15:55 (GMT)
committeraxis <qt-info@nokia.com>2010-03-11 09:42:47 (GMT)
commita375537d32bc33ba1154ec132f99f5a779bce067 (patch)
tree3c23e3b2c44fb52d7d62036fe7dd793e589841e8 /doc/src/development/qmake-manual.qdoc
parent02f6da62a42bd1059eb0da091d1f46efbb919750 (diff)
parent1e9552f826c05bf9884fb2893dedca265ead363b (diff)
downloadQt-a375537d32bc33ba1154ec132f99f5a779bce067.zip
Qt-a375537d32bc33ba1154ec132f99f5a779bce067.tar.gz
Qt-a375537d32bc33ba1154ec132f99f5a779bce067.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public
Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/makefile.h qmake/project.cpp src/3rdparty/webkit/WebCore/WebCore.pro src/src.pro
Diffstat (limited to 'doc/src/development/qmake-manual.qdoc')
-rw-r--r--doc/src/development/qmake-manual.qdoc28
1 files changed, 28 insertions, 0 deletions
diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index c314eb8..1a34a6c 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -2972,6 +2972,34 @@ For example:
\snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 51
+ It is possible to modify this default behavior of \c SUBDIRS by giving
+ additional modifiers to \c SUBDIRS elements. Supported modifiers are:
+
+ \table
+ \header \o Modifier \o Effect
+ \row \o .subdir \o Use the specified subdirectory instead of \c SUBDIRS value.
+ \row \o .file \o Specify the subproject \c pro file explicitly. Cannot be
+ used in conjunction with \c .subdir modifier.
+ \row \o .condition \o Specifies a \c bld.inf define that must be true for
+ subproject to be built. Available only on Symbian platform.
+ \row \o .depends \o This subproject depends on specified subproject.
+ Available only on platforms that use makefiles.
+ \row \o .makefile \o The makefile of subproject.
+ Available only on platforms that use makefiles.
+ \row \o .target \o Base string used for makefile targets related to this
+ subproject.
+ Available only on platforms that use makefiles.
+ \endtable
+
+ For example, define two subdirectories, both of which reside in a different directory
+ than the \c SUBDIRS value, and one of the subdirectories must be built before the other:
+
+ \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 149
+
+ For example, define a subdirectory that is only build for emulator builds in Qt for Symbian:
+
+ \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 150
+
\target TARGET
\section1 TARGET