Refactor platform checks

This simply rewrites isPlatformSupported to be easier
to read.

Task-number: QTBUG-75840
Task-number: QTBUG-76606
Change-Id: I3aab893f2f6db88928eda00d0db650150c7ccf2c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 12 insertions, 1 deletions

diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
index a301929dc..ec78a59cb 100644
--- a/mkspecs/features/functions.prf
+++ b/mkspecs/features/functions.prf
@@ -103,6 +103,12 @@ defineTest(skipBuild) {
 }
 
 defineTest(isWebEngineCoreBuild) {
+
+    static{
+       skipBuild("Static builds of QtWebEngine aren't supported.")
+       return(false)
+    }
+
     !qtHaveModule(gui) {
         skipBuild("QtWebEngine requires QtGui.")
         return(false)
@@ -121,7 +127,12 @@ defineTest(isWebEngineCoreBuild) {
 
     !isPlatformSupported() {
         # make sure we have skipBuildReason
-        isEmpty(skipBuildReason): skipBuild("Unknow error. Platform unspported")
+        isEmpty(skipBuildReason): skipBuild("Unknow error. Platform unspported.")
+        return(false)
+    }
+
+    !isArchSupported() {
+        isEmpty(skipBuildReason): skipBuild("Unknown error. Architecture unsupported.")
         return(false)
     }