summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2019-05-31 10:58:43 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2019-05-31 12:53:23 +0000
commitb99e4387f66fe8f89fb7470c0dec5f6378a94c7d (patch)
tree2f9221c0a6d8f626154ac1ef7f8b0768713f8786 /cmake
parent8fa646dbe2eba9674809042ff15e98f0eb1018d5 (diff)
Add architecture and abi to generated qconfig.pri
Task-number: QTBUG-75666 Change-Id: If2933005038557c2b5041da6bd02c5890ac786ef Reviewed-by: Qt CMake Build Bot Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/QtBuild.cmake4
1 files changed, 3 insertions, 1 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
index 80b7a32fb7..184cb5e19f 100644
--- a/cmake/QtBuild.cmake
+++ b/cmake/QtBuild.cmake
@@ -354,7 +354,9 @@ function(qt_generate_global_config_pri_file)
file(GENERATE
OUTPUT "${qconfig_pri_target_path}"
CONTENT
- "QT.global.enabled_features = ${enabled_features}
+ "QT_ARCH = ${TEST_architecture_arch}
+QT_BUILDABI = ${TEST_buildAbi}
+QT.global.enabled_features = ${enabled_features}
QT.global.disabled_features = ${disabled_features}
QT_VERSION = ${PROJECT_VERSION}
QT_MAJOR_VERSION = ${PROJECT_VERSION_MAJOR}