diff options
| -rw-r--r-- | configure.pri | 26 | ||||
| -rw-r--r-- | src/core/configure.json | 30 |
2 files changed, 56 insertions, 0 deletions
diff --git a/configure.pri b/configure.pri index 82a7de227..4ce40351a 100644 --- a/configure.pri +++ b/configure.pri @@ -260,3 +260,29 @@ defineReplace(qtConfFunc_isTestsInBuildParts) { contains(QT_BUILD_PARTS, tests): return(true) return(false) } + +defineReplace(webEngineGetMacOSVersion) { + value = $$system("sw_vers -productVersion 2>/dev/null") + return($$value) +} + +defineReplace(webEngineGetMacOSSDKVersion) { + value = $$system("/usr/bin/xcodebuild -sdk $$QMAKE_MAC_SDK -version ProductVersion 2>/dev/null") + return($$value) +} + +defineReplace(webEngineGetMacOSClangVerboseVersion) { + output = $$system("$$QMAKE_CXX --version 2>/dev/null", lines) + value = $$first(output) + return($$value) +} + +defineTest(qtConfReport_macosToolchainVersion) { + arg = $$2 + contains(arg, "macosVersion"): report_message = $$webEngineGetMacOSVersion() + contains(arg, "xcodeVersion"): report_message = "$$QMAKE_XCODE_VERSION" + contains(arg, "clangVersion"): report_message = $$webEngineGetMacOSClangVerboseVersion() + contains(arg, "sdkVersion"): report_message = $$webEngineGetMacOSSDKVersion() + contains(arg, "deploymentTarget"): report_message = "$$QMAKE_MACOSX_DEPLOYMENT_TARGET" + !isEmpty(report_message): qtConfReportPadded($$1, $$report_message) +} diff --git a/src/core/configure.json b/src/core/configure.json index b1182e789..fddcb9ae8 100644 --- a/src/core/configure.json +++ b/src/core/configure.json @@ -680,6 +680,36 @@ "condition": "config.sanitizer" }, { + "message": "macOS version", + "type": "macosToolchainVersion", + "args": "macosVersion", + "condition": "config.macos" + }, + { + "message": "Xcode version", + "type": "macosToolchainVersion", + "args": "xcodeVersion", + "condition": "config.macos" + }, + { + "message": "Clang version", + "type": "macosToolchainVersion", + "args": "clangVersion", + "condition": "config.macos" + }, + { + "message": "macOS SDK version", + "type": "macosToolchainVersion", + "args": "sdkVersion", + "condition": "config.macos" + }, + { + "message": "macOS minimum deployment target", + "type": "macosToolchainVersion", + "args": "deploymentTarget", + "condition": "config.macos" + }, + { "section": "Optional system libraries used", "condition": "config.unix", "entries": [ |