diff options
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/mac/sdk.prf | 12 | ||||
| -rw-r--r-- | mkspecs/features/qmltestcase.prf | 1 |
2 files changed, 6 insertions, 7 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}) } diff --git a/mkspecs/features/qmltestcase.prf b/mkspecs/features/qmltestcase.prf index 4dfec50be8..216f37d61a 100644 --- a/mkspecs/features/qmltestcase.prf +++ b/mkspecs/features/qmltestcase.prf @@ -1,7 +1,6 @@ !isEmpty(SOURCES) { QT += qml qmltest load(testcase) - CONFIG -= app_bundle DEFINES += QUICK_TEST_SOURCE_DIR=\"\\\"$$_PRO_FILE_PWD_\\\"\" } else { # Allow a project to run tests without a CPP stub |