diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2019-09-04 12:53:12 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2019-09-19 07:52:20 +0000 |
| commit | 08193968719f746cdd4809b2194e1fb445e35fa5 (patch) | |
| tree | ba61b5283ebe477dcb975b78bd1efa8638363b55 /configure.pri | |
| parent | 1cb3e7271f0ce29647da5eda1e8ff3e5cf4e7abd (diff) | |
FIXUP: Fix top level build again
When we are doing top level build QTWEBENGINE_ROOT/QTWEBENGINE_ROOT_OUT
is not present at configure step, therefore add two ways of calling
checkError, one for configure time and one for make call.
Fix typo in submodule's condition. Add a poor man's workaround
for this test.
Change-Id: Ie95ab9ffe262a45c7e1ea49e4795d142b7df716a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/configure.pri b/configure.pri index 054ab283b..acb345ae6 100644 --- a/configure.pri +++ b/configure.pri @@ -342,6 +342,10 @@ defineTest(qtConfTest_hasGcc6OrNewer) { } defineTest(qtConfTest_detectSubmodule) { + isEmpty(QTWEBENGINE_ROOT) { + # topLevel build , add poor man's workaround + QTWEBENGINE_ROOT=$$PWD/../../../qtwebengine + } !exists($$QTWEBENGINE_ROOT/src/3rdparty/chromium):return(false) return(true) } @@ -351,3 +355,8 @@ defineTest(qtConfTest_detectNoWhitespace) { !isEmpty(WSPC):return(false) return(true) } + +defineTest(qtwebengine_confCheckError) { + QT_FOR_CONFIG += buildtools-private gui-private + return($$qtwebengine_checkError()) +} |