From c864129af8ff6157a6c9a5a532e01a1ee69e98ce Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 9 Jul 2018 15:57:22 +0200 Subject: Print macOS toolchain info when configuring WebEngine It's not always easy to determine what Xcode / clang version is used when building WebEngine in the CI. Same for the OS version and other toolchain details. Print out the values at QtWebEngine configure time. This will also help us when users provide build logs. Change-Id: I413a6c5b6efb42c4411268ca46d07c2fb9b85cc3 Reviewed-by: Allan Sandfeld Jensen Reviewed-by: Kai Koehne --- configure.pri | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'configure.pri') 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) +} -- cgit v1.2.3