diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-04 18:08:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-04 18:09:33 +0200 |
| commit | 9419dfe8ee45d08f09c09d3cbece511d721546f0 (patch) | |
| tree | 1c4584099fc1efb8de30cc4526ce7ebafe8a8ce9 /configure.pri | |
| parent | 8b5aa7b6c40d70a7ec15b3ea485f28a142fb247c (diff) | |
| parent | 8675e1c5ee7d1209784a2320f1ae3f486b1eaae4 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h
src/plugins/platforms/xcb/qxcbwindow.cpp
Change-Id: Ic747c3c50e68c005b425e7a1ec2a90965527c8bd
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/configure.pri b/configure.pri index 42f3247a59..c422c73650 100644 --- a/configure.pri +++ b/configure.pri @@ -258,15 +258,18 @@ defineTest(qtConfTest_architecture) { arch_magic = ".*==Qt=magic=Qt== Architecture:([^\\0]*).*" subarch_magic = ".*==Qt=magic=Qt== Sub-architecture:([^\\0]*).*" + buildabi_magic = ".*==Qt=magic=Qt== Build-ABI:([^\\0]*).*" - !contains(content, $$arch_magic)|!contains(content, $$subarch_magic): \ + !contains(content, $$arch_magic)|!contains(content, $$subarch_magic)|!contains(content, $$buildabi_magic): \ error("$$eval($${1}.label) detection binary does not contain expected data.") $${1}.arch = $$replace(content, $$arch_magic, "\\1") $${1}.subarch = $$replace(content, $$subarch_magic, "\\1") $${1}.subarch = $$split($${1}.subarch, " ") + $${1}.buildabi = $$replace(content, $$buildabi_magic, "\\1") export($${1}.arch) export($${1}.subarch) + export($${1}.buildabi) qtLog("Detected architecture: $$eval($${1}.arch) ($$eval($${1}.subarch))") $${1}.cache += arch subarch @@ -869,9 +872,11 @@ defineTest(qtConfOutput_shared) { defineTest(qtConfOutput_architecture) { arch = $$qtConfEvaluate("tests.architecture.arch") + buildabi = $$qtConfEvaluate("tests.architecture.buildabi") $$qtConfEvaluate("features.cross_compile") { host_arch = $$qtConfEvaluate("tests.host_architecture.arch") + host_buildabi = $$qtConfEvaluate("tests.host_architecture.buildabi") privatePro = \ "host_build {" \ @@ -883,15 +888,18 @@ defineTest(qtConfOutput_architecture) { "host_build {" \ " QT_ARCH = $$host_arch" \ " QT_TARGET_ARCH = $$arch" \ + " QT_TARGET_BUILDABI = $$buildabi" \ "} else {" \ " QT_ARCH = $$arch" \ + " QT_BUILDABI = $$host_buildabi" \ "}" } else { privatePro = \ "QT_CPU_FEATURES.$$arch = $$qtConfEvaluate('tests.architecture.subarch')" publicPro = \ - "QT_ARCH = $$arch" + "QT_ARCH = $$arch" \ + "QT_BUILDABI = $$buildabi" } $${currentConfig}.output.publicPro += $$publicPro |