From 3cb2819e6dcbb973414c11e6863cd4ea03bd66f9 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Mon, 10 Dec 2018 15:01:00 -0600 Subject: [PATCH] qtwebengine: allow any xcblah in PATH Change-Id: Ib38ab9c66e3f60e84a366693995d83fc3160880a --- mkspecs/features/platform.prf | 2 +- src/core/config/mac_osx.pri | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtwebengine/mkspecs/features/platform.prf b/qtwebengine/mkspecs/features/platform.prf index 35eb6b89..de8b5338 100644 --- a/qtwebengine/mkspecs/features/platform.prf +++ b/qtwebengine/mkspecs/features/platform.prf @@ -111,7 +111,7 @@ defineTest(isMinOSXSDKVersion) { requested_minor = $$2 requested_patch = $$3 isEmpty(requested_patch): requested_patch = 0 - WEBENGINE_OSX_SDK_PRODUCT_VERSION = $$system("/usr/bin/xcodebuild -sdk $$QMAKE_MAC_SDK -version ProductVersion 2>/dev/null") + WEBENGINE_OSX_SDK_PRODUCT_VERSION = $$system("xcodebuild -sdk $$QMAKE_MAC_SDK -version ProductVersion 2>/dev/null") export(WEBENGINE_OSX_SDK_PRODUCT_VERSION) isEmpty(WEBENGINE_OSX_SDK_PRODUCT_VERSION) { skipBuild("Could not resolve SDK product version for \'$$QMAKE_MAC_SDK\'.") diff --git a/qtwebengine/src/core/config/mac_osx.pri b/qtwebengine/src/core/config/mac_osx.pri index 4426901c..52f89df3 100644 --- a/qtwebengine/src/core/config/mac_osx.pri +++ b/qtwebengine/src/core/config/mac_osx.pri @@ -5,7 +5,7 @@ load(functions) # otherwise query for it. QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion) isEmpty(QMAKE_MAC_SDK_VERSION) { - QMAKE_MAC_SDK_VERSION = $$system("/usr/bin/xcodebuild -sdk $${QMAKE_MAC_SDK} -version SDKVersion 2>/dev/null") + QMAKE_MAC_SDK_VERSION = $$system("xcodebuild -sdk $${QMAKE_MAC_SDK} -version SDKVersion 2>/dev/null") isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'") } -- 2.19.1