diff options
author | Liang Qi <liang.qi@qt.io> | 2020-01-09 20:30:39 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2020-01-09 20:30:39 +0100 |
commit | a59c7684897bfbbb7ddcec2f05263fee92ab5056 (patch) | |
tree | 50793671569f87bdbfc0e9ff36adbf416971d6cf /qmake | |
parent | 5507d0f1b04ea6b1d91be9ade30bc31d1830c220 (diff) | |
parent | 1c75f59588694557caba69c2fc173dd8f1d7f514 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/corelib/kernel/qobject.cpp
Change-Id: I4780b25665672692b086ee92092e506c814642f2
Diffstat (limited to 'qmake')
-rw-r--r-- | qmake/doc/snippets/qmake/scopes.pro | 18 | ||||
-rw-r--r-- | qmake/doc/src/qmake-manual.qdoc | 14 |
2 files changed, 32 insertions, 0 deletions
diff --git a/qmake/doc/snippets/qmake/scopes.pro b/qmake/doc/snippets/qmake/scopes.pro index 63b9b3aa55..6721937755 100644 --- a/qmake/doc/snippets/qmake/scopes.pro +++ b/qmake/doc/snippets/qmake/scopes.pro @@ -40,3 +40,21 @@ win32|macx { HEADERS += debugging.h } #! [4] + +#! [5] +if(win32|macos):CONFIG(debug, debug|release) { + # Do something on Windows and macOS, + # but only for the debug configuration. +} +win32|if(macos:CONFIG(debug, debug|release)) { + # Do something on Windows (regardless of debug or release) + # and on macOS (only for debug). +} +#! [5] + +#! [6] +win32-* { + # Matches every mkspec starting with "win32-" + SOURCES += win32_specific.cpp +} +#! [6] diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index b002521a8e..64c5f0a14e 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -4418,6 +4418,20 @@ \snippet qmake/scopes.pro 4 + If you need to mix both operators, you can use the \c if function to specify + operator precedence. + + \snippet qmake/scopes.pro 5 + + The condition accepts the wildcard character to match a family of \c{CONFIG} + values or mkspec names. + + \snippet qmake/scopes.pro 6 + + \note Historically, checking the mkspec name with wildcards like above was + qmake's way to check for the platform. Nowadays, we recommend to use values + that are defined by the mkspec in the \c QMAKE_PLATFORM variable. + You can also provide alternative declarations to those within a scope by using an \c else scope. Each \c else scope is processed if the conditions for the preceding scopes are false. |