From 1cb3e7271f0ce29647da5eda1e8ff3e5cf4e7abd Mon Sep 17 00:00:00 2001 From: Michal Klocek 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 Reviewed-by: Joerg Bornemann --- configure.pri | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'configure.pri') diff --git a/configure.pri b/configure.pri index 3d6d991ba..054ab283b 100644 --- a/configure.pri +++ b/configure.pri @@ -340,3 +340,14 @@ defineTest(qtConfTest_hasGcc6OrNewer) { greaterThan(QMAKE_GCC_MAJOR_VERSION, 5):return(true) return(false) } + +defineTest(qtConfTest_detectSubmodule) { + !exists($$QTWEBENGINE_ROOT/src/3rdparty/chromium):return(false) + return(true) +} + +defineTest(qtConfTest_detectNoWhitespace) { + WSPC = $$find(OUT_PWD, \\s) + !isEmpty(WSPC):return(false) + return(true) +} -- cgit v1.2.3