From 1cb3e7271f0ce29647da5eda1e8ff3e5cf4e7abd Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Mon, 2 Sep 2019 16:08:01 +0200
Subject: Unify error reporting for configure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move last two tests (submodule and nowhitespace) to configure
system and unify error reporting. Now all error
messages come from one single place qtwebengine_checkErrors().
This function is used by configure system reporting and by make call.
Remove duplicated strings.

Add extra messages when module is not going to be built.

Change-Id: Ib373facd58135325495aad52b6e600ec9a61f31f
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 mkspecs/features/functions.prf | 107 -----------------------------------------
 1 file changed, 107 deletions(-)

(limited to 'mkspecs/features/functions.prf')

diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
index b512db2f1..a67aba883 100644
--- a/mkspecs/features/functions.prf
+++ b/mkspecs/features/functions.prf
@@ -98,113 +98,6 @@ defineReplace(gnOS) {
     return(unknown)
 }
 
-defineTest(isWebEngineCoreBuild) {
-
-    static {
-       qtwebengine_skipBuild("Static builds of QtWebEngine are not supported.")
-       return(false)
-    }
-
-    !qtHaveModule(gui) {
-        qtwebengine_skipBuild("QtWebEngine requires QtGui.")
-        return(false)
-    }
-
-    !exists($$QTWEBENGINE_ROOT/src/3rdparty/chromium) {
-        qtwebengine_skipBuild("Submodule qtwebengine-chromium does not exist. Run 'git submodule update --init'.")
-        return(false)
-    }
-
-    WSPC = $$find(OUT_PWD, \\s)
-    !isEmpty(WSPC) {
-        qtwebengine_skipBuild("QtWebEngine cannot be built in a path that contains whitespace characters.")
-        return(false)
-    }
-
-    !qtwebengine_isPlatformSupported() {
-        # make sure we have skipBuildReason
-        isEmpty(skipBuildReason): qtwebengine_skipBuild("Unknow error. Platform unspported.")
-        return(false)
-    }
-
-    !qtwebengine_isArchSupported() {
-        isEmpty(skipBuildReason): qtwebengine_skipBuild("Unknown error. Architecture unsupported.")
-        return(false)
-    }
-
-    linux:contains(QT_CONFIG,no-pkg-config) {
-        qtwebengine_skipBuild("pkg-config is required")
-        return(false)
-    }
-
-    include($$QTWEBENGINE_OUT_ROOT/src/buildtools/qtbuildtools-config.pri)
-    QT_FOR_CONFIG += buildtools-private
-
-    win32:!qtConfig(webengine-win-compiler64) {
-        qtwebengine_skipBuild("Required 64-bit cross-building or native toolchain could not be found.")
-        return(false)
-    }
-
-    win32:!qtConfig(webengine-winversion) {
-        qtwebengine_skipBuild("Needs Visual Studio 2017 or higher")
-        return(false)
-    }
-
-    !qtConfig(webengine-gperf) {
-        qtwebengine_skipBuild("Required gperf could not be found.")
-        return(false)
-    }
-    !qtConfig(webengine-bison) {
-        qtwebengine_skipBuild("Required bison could not be found.")
-        return(false)
-    }
-    !qtConfig(webengine-flex) {
-        qtwebengine_skipBuild("Required flex could not be found.")
-        return(false)
-    }
-    !qtConfig(webengine-python2) {
-        qtwebengine_skipBuild("A suitable version of python2 could not be found.")
-        return(false)
-    }
-
-    sanitizer: !qtConfig(webengine-sanitizer) {
-        qtwebengine_skipBuild("Chosen sanitizer configuration is not supported. Check config.log for details or use -feature-webengine-sanitizer to force build with the chosen sanitizer configuration.")
-        return(false);
-    }
-
-    linux {
-
-        !qtConfig(webengine-host-pkg-config) {
-            qtwebengine_skipBuild("Host pkg-config is required")
-            return(false)
-        }
-
-        !qtConfig(webengine-system-glibc) {
-            qtwebengine_skipBuild("A suitable version >= 2.27 of libc could not be found.")
-            return(false)
-        }
-
-        QT_FOR_CONFIG += gui-private
-
-        !qtConfig(webengine-system-khr) {
-            qtwebengine_skipBuild("khronos development headers appear to be missing (mesa/libegl1-mesa-dev)")
-            return(false)
-        }
-
-        for(package, $$list("nss dbus fontconfig")) {
-            !qtConfig(webengine-system-$$package) {
-                qtwebengine_skipBuild("A suitable version of $$package could not be found.")
-                return(false)
-            }
-         }
-
-        qtConfig(xcb) : !qtConfig(webengine-ozone-x11) {
-            qtwebengine_skipBuild("Could not find all necessary libraries for qpa-xcb support")
-            return(false)
-        }
-    }
-}
-
 defineReplace(pkgConfigHostExecutable) {
     wrapper_name = $$OUT_PWD/pkg-config-host_wrapper.sh
     wrapper_cmd = $$QMAKE_PKG_CONFIG_HOST
-- 
cgit v1.2.3