diff options
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/configure.pri b/configure.pri index 34d7c8cf42..03eacd3c07 100644 --- a/configure.pri +++ b/configure.pri @@ -251,6 +251,11 @@ defineTest(qtConfTest_machineTuple) { return(true) } +defineTest(qtConfTest_verifySpec) { + qtConfTest_compile($$1): return(true) + qtConfFatalError("Cannot compile a minimal program. The toolchain or QMakeSpec is broken.", log) +} + defineTest(qtConfTest_architecture) { !qtConfTest_compile($${1}): \ error("Could not determine $$eval($${1}.label). See config.log for details.") @@ -412,7 +417,7 @@ defineTest(qtConfTest_x86SimdAlways) { qtConfCheckFeature($$f) equals($${fpfx}.$${f}.available, true): configs += $$f } - $${1}.literal_args = $$system_quote(SIMD=$$join(configs, " ")) + $${1}.literal_args = SIMD=$$join(configs, " ") qtConfTest_compile($${1}) } @@ -1139,6 +1144,12 @@ defineReplace(qtConfOutputPostProcess_publicPro) { "QT_ICC_MINOR_VERSION = $$format_number($$replace(QMAKE_ICC_VER, "(..)(..)", "\\2"))" \ "QT_ICC_PATCH_VERSION = $$QMAKE_ICC_UPDATE_VER" } + !isEmpty(QMAKE_GHS_VERSION) { + output += \ + "QT_GHS_MAJOR_VERSION = $$replace(QMAKE_GHS_VERSION, "(.*)(.)(.)", "\\1")" \ + "QT_GHS_MINOR_VERSION = $$replace(QMAKE_GHS_VERSION, "(.*)(.)(.)", "\\2")" \ + "QT_GHS_PATCH_VERSION = $$replace(QMAKE_GHS_VERSION, "(.*)(.)(.)", "\\3")" + } output += "QT_EDITION = $$config.input.qt_edition" !contains(config.input.qt_edition, "(OpenSource|Preview)") { |