diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-04-20 12:21:57 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-04-20 12:21:57 +0200 |
| commit | cf204590ea94bb3a191b5e783471bd6f5a04ab8e (patch) | |
| tree | f96b4dc4c3995b0a3a2d1b8291144846c30baa64 /mkspecs/features/mac/sdk.prf | |
| parent | c579a77f841ed44df25553972f8807110c55808d (diff) | |
| parent | 941db4e0bb3170b6bc3cf775f150a226754e6285 (diff) | |
Merge 5.11 into 5.11.0
Change-Id: I11c61dc1259ed66d871ecab2666085ccf37a9342
Diffstat (limited to 'mkspecs/features/mac/sdk.prf')
| -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}) } |