diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-20 19:23:14 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-04-20 20:06:18 +0000 |
| commit | 100ebf1c97dec1fcfea29d790c07993d071cbb3f (patch) | |
| tree | b1f12ddf8834ba77f2143344008b0e9f673cdda1 /mkspecs/features/mac | |
| parent | f35f282c4f0ef11dc35bc9120852ff9e77f85297 (diff) | |
| parent | 6f45fda50b6dbb0704a71a15f38d44027b4b1816 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev
Diffstat (limited to 'mkspecs/features/mac')
| -rw-r--r-- | mkspecs/features/mac/sdk.prf | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf index bbcad8125c..8360dd8b38 100644 --- a/mkspecs/features/mac/sdk.prf +++ b/mkspecs/features/mac/sdk.prf @@ -8,21 +8,21 @@ contains(QMAKE_MAC_SDK, .*/.*): \ defineReplace(xcodeSDKInfo) { info = $$1 equals(info, "Path"): \ - info = --show-sdk-path + infoarg = --show-sdk-path equals(info, "PlatformPath"): \ - info = --show-sdk-platform-path + infoarg = --show-sdk-platform-path equals(info, "SDKVersion"): \ - info = --show-sdk-version + infoarg = --show-sdk-version sdk = $$2 isEmpty(sdk): \ sdk = $$QMAKE_MAC_SDK isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) { - QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$info 2>/dev/null") + QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$infoarg 2>/dev/null") # --show-sdk-platform-path won't work for Command Line Tools; this is fine # only used by the XCTest backend to testlib - isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(info, "--show-sdk-platform-path")): \ - error("Could not resolve SDK $$info for \'$$sdk\'") + isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(infoarg, "--show-sdk-platform-path")): \ + error("Could not resolve SDK $$info for \'$$sdk\' using $$infoarg") cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info}) } |