diff options
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/configure.pri b/configure.pri index 49755f7abf..63d6b3f278 100644 --- a/configure.pri +++ b/configure.pri @@ -662,6 +662,13 @@ defineTest(qtConfOutput_commitOptions) { write_file($$QT_BUILD_TREE/mkspecs/qdevice.pri, $${currentConfig}.output.devicePro)|error() } +# Output is written after configuring each Qt module, +# but some tests within a module might depend on the +# configuration output of previous tests. +defineTest(qtConfOutput_commitConfig) { + qtConfProcessOutput() +} + # type (empty or 'host'), option name, default value defineTest(processQtPath) { out_var = config.rel_input.$${2} @@ -985,6 +992,12 @@ defineTest(qtConfOutput_architecture) { subarch = $$qtConfEvaluate('tests.architecture.subarch') buildabi = $$qtConfEvaluate("tests.architecture.buildabi") + macos { + eval($$config.input.qmakeArgs) + apple_archs = $$QMAKE_APPLE_DEVICE_ARCHS + isEmpty(apple_archs): apple_archs = "\$\$QT_ARCH" + } + $$qtConfEvaluate("features.cross_compile") { host_arch = $$qtConfEvaluate("tests.host_architecture.arch") host_buildabi = $$qtConfEvaluate("tests.host_architecture.buildabi") @@ -1006,12 +1019,22 @@ defineTest(qtConfOutput_architecture) { " QT_BUILDABI = $$buildabi" \ "}" + macos { + publicPro += \ + "host_build {" \ + " QT_ARCHS = \$\$QT_ARCH" \ + "} else {" \ + " QT_ARCHS = $$apple_archs" \ + "}" + } } else { privatePro = \ "QT_CPU_FEATURES.$$arch = $$subarch" publicPro = \ "QT_ARCH = $$arch" \ "QT_BUILDABI = $$buildabi" + + macos: publicPro += "QT_ARCHS = $$apple_archs" } $${currentConfig}.output.publicPro += $$publicPro |