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: 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 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'configure.pri')

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) {
-- 
cgit v1.2.3