diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-02-26 13:24:11 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-02-26 13:24:11 (GMT) |
| commit | b78012c855a8b00fa0d100cd0cf6c8de024dfa69 (patch) | |
| tree | 75cd20ff9e068c04996daf0d4aed4e15b49b5992 /doc/src/development | |
| parent | 5e9382c018e231c5e2ef49dd8a38eaff535b9837 (diff) | |
| parent | 7ca00ed67cb18fb858e1e89cec21b3db696fa923 (diff) | |
| download | Qt-b78012c855a8b00fa0d100cd0cf6c8de024dfa69.zip Qt-b78012c855a8b00fa0d100cd0cf6c8de024dfa69.tar.gz Qt-b78012c855a8b00fa0d100cd0cf6c8de024dfa69.tar.bz2 | |
Merge branch '4.6'
Conflicts:
mkspecs/common/symbian/symbian.conf
Diffstat (limited to 'doc/src/development')
| -rw-r--r-- | doc/src/development/qmake-manual.qdoc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc index 6406193..36bfcfe 100644 --- a/doc/src/development/qmake-manual.qdoc +++ b/doc/src/development/qmake-manual.qdoc @@ -1727,8 +1727,15 @@ distinction between shared and \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 139 + There is also a convenience function for adding conditional rules + called \c{addMMPRules}. Suppose you need certain functionality + to require different library depending on architecture. This + can be specified with \c{addMMPRules} as follows: + + \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 148 + \note You should not use this variable to add MMP statements that are - explicitly supported by their own variables, such as + explicitly supported by their own variables, such as \c TARGET.EPOCSTACKSIZE. Doing so could result in duplicate statements in the MMP file. |