diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-08 09:34:24 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-08 09:34:24 +0100 |
| commit | 0e96b5fe482802935ae202e2297404845e440d71 (patch) | |
| tree | 79c566f18bc605261f69d750d2935b91edba3861 /mkspecs/features/mac/default_post.prf | |
| parent | da43362921a62ea3163a042be20ec0f550d05cfa (diff) | |
| parent | 5733dfbd90fd059e7310786faefb022b00289592 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.12.1
Conflicts:
src/widgets/kernel/qtooltip.cpp
Change-Id: Ic2f9a425359050eb56b3a4e5162cf5e3447058c8
Diffstat (limited to 'mkspecs/features/mac/default_post.prf')
| -rw-r--r-- | mkspecs/features/mac/default_post.prf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf index c01e99fe8e..8e2c5e603a 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf @@ -1,7 +1,7 @@ load(default_post) contains(TEMPLATE, .*app) { - !macx-xcode { + !macx-xcode:if(isEmpty(BUILDS)|build_pass) { # Detect changes to the platform SDK QMAKE_EXTRA_VARIABLES += QMAKE_MAC_SDK QMAKE_MAC_SDK_VERSION QMAKE_XCODE_DEVELOPER_PATH QMAKE_EXTRA_INCLUDES += $$shell_quote($$PWD/sdk.mk) @@ -21,7 +21,7 @@ contains(TEMPLATE, .*app) { !isEmpty($$list($$(QT_MAC_SDK_NO_VERSION_CHECK))): \ CONFIG += sdk_no_version_check - QMAKE_MAC_SDK_MAJOR_MINOR_VERSION = $$replace(QMAKE_MAC_SDK_VERSION, "(\d+)(\.\d+)(\.\d+)?", \1\2) + QMAKE_MAC_SDK_MAJOR_MINOR_VERSION = $$replace(QMAKE_MAC_SDK_VERSION, "(\\d+)(\\.\\d+)(\\.\\d+)?", \\1\\2) !sdk_no_version_check:!versionAtMost(QMAKE_MAC_SDK_MAJOR_MINOR_VERSION, $$QT_MAC_SDK_VERSION_MAX) { warning("Qt has only been tested with version $$QT_MAC_SDK_VERSION_MAX"\ |