From d9bbf709cd0a2013833863a66396bc62f0165f48 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Wed, 4 Sep 2019 19:32:05 +0200
Subject: [PATCH] Clean up architecture support test
Make it a private feature so test is not run twice.
Change-Id: I1dcea41edf5dbc6992e76991d92278a5a5c13e55
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
configure.pri | 13 +++++++------
src/buildtools/config/platform.pri | 14 ++------------
src/buildtools/configure.json | 9 +++++++--
3 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/configure.pri b/configure.pri
index acb345ae6..b7bb0f34d 100644
--- a/configure.pri
+++ b/configure.pri
@@ -104,19 +104,20 @@ defineTest(qtConfTest_detectBison) {
defineTest(qtConfTest_detectPlatform) {
!qtwebengine_isPlatformSupported() {
- qtLog("Platform not supported".)
+ qtLog("Platform not supported.")
return(false)
}
return(true)
}
defineTest(qtConfTest_detectArch) {
- !qtwebengine_isArchSupported() {
- qtLog("Architecture not supported".)
- return(false)
- }
- return(true)
+ contains(QT_ARCH, "i386")|contains(QT_ARCH, "x86_64"): return(true)
+ contains(QT_ARCH, "arm")|contains(QT_ARCH, "arm64"): return(true)
+ contains(QT_ARCH, "mips"): return(true)
+ qtLog("Architecture not supported.")
+ return(false)
}
+
defineTest(qtConfTest_detectFlex) {
flex = $$qtConfFindGnuTool("flex$$EXE_SUFFIX")
isEmpty(flex) {
diff --git a/src/buildtools/config/platform.pri b/src/buildtools/config/platform.pri
index 8ff3da4c3..8645e682f 100644
--- a/src/buildtools/config/platform.pri
+++ b/src/buildtools/config/platform.pri
@@ -66,16 +66,6 @@ defineTest(qtwebengine_isPlatformSupported) {
return(false)
}
-defineTest(qtwebengine_isArchSupported) {
- contains(QT_ARCH, "i386")|contains(QT_ARCH, "x86_64"): return(true)
- contains(QT_ARCH, "arm")|contains(QT_ARCH, "arm64"): return(true)
- contains(QT_ARCH, "mips"): return(true)
-# contains(QT_ARCH, "mips64"): return(true)
-
- qtwebengine_skipBuild("QtWebEngine can only be built for x86, x86-64, ARM, Aarch64, and MIPSel architectures.")
- return(false)
-}
-
defineTest(qtwebengine_isGCCVersionSupported) {
# Keep in sync with src/webengine/doc/src/qtwebengine-platform-notes.qdoc
greaterThan(QMAKE_GCC_MAJOR_VERSION, 4):return(true)
@@ -190,8 +180,8 @@ defineReplace(qtwebengine_checkError) {
return(false)
}
- !qtwebengine_isArchSupported() {
- isEmpty(skipBuildReason): qtwebengine_skipBuild("Unknown error. Architecture unsupported.")
+ !qtConfig(webengine-arch-support) {
+ qtwebengine_skipBuild("QtWebEngine can only be built for x86, x86-64, ARM, Aarch64, and MIPSel architectures.")
return(false)
}
diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json
index 81780f7c7..d7cac2b5c 100644
--- a/src/buildtools/configure.json
+++ b/src/buildtools/configure.json
@@ -356,7 +356,7 @@
"label": "platform supported",
"type": "detectPlatform"
},
- "webengine-architecture": {
+ "webengine-arch-support": {
"label": "architecture supported",
"type": "detectArch"
},
@@ -379,8 +379,8 @@
&& features.webengine-flex
&& features.webengine-submodule
&& features.webengine-nowhitespace
+ && features.webengine-arch-support
&& tests.webengine-platform
- && tests.webengine-architecture
&& !config.static
&& (!config.linux || features.pkg-config)
&& (!features.xcb || features.webengine-ozone-x11)
@@ -661,6 +661,11 @@
"label": "nowhitespace",
"condition" : "tests.webengine-nowhitespace",
"output": [ "privateFeature" ]
+ },
+ "webengine-arch-support": {
+ "label": "architecture",
+ "condition" : "tests.webengine-arch-support",
+ "output": [ "privateFeature" ]
}
},
"report": [
--
GitLab