diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2019-09-02 16:08:01 +0200 |
|---|---|---|
| committer | Jörg Bornemann <joerg.bornemann@qt.io> | 2019-09-19 07:52:06 +0000 |
| commit | 1cb3e7271f0ce29647da5eda1e8ff3e5cf4e7abd (patch) | |
| tree | 3999d15c36ebc491533d97f2efd48cdc27a168ac /configure.pri | |
| parent | 4d1d6fbea5ba80efde7f62532d7c73532361cea9 (diff) | |
| download | qtwebengine-1cb3e7271f0ce29647da5eda1e8ff3e5cf4e7abd.tar.gz | |
Unify error reporting for configure
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>
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 11 |
1 files changed, 11 insertions, 0 deletions
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) +} |