diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/buildtools/config/platform.pri | 14 | ||||
-rw-r--r-- | src/buildtools/configure.json | 9 |
2 files changed, 9 insertions, 14 deletions
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": [ |