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 /src/buildtools/config | |
| 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 'src/buildtools/config')
| -rw-r--r-- | src/buildtools/config/platform.pri | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/buildtools/config/platform.pri b/src/buildtools/config/platform.pri index c5a8d524f..8ff3da4c3 100644 --- a/src/buildtools/config/platform.pri +++ b/src/buildtools/config/platform.pri @@ -163,10 +163,7 @@ defineTest(qtwebengine_skipBuild) { export(skipBuildReason) } -defineTest(qtwebengine_checkError) { - - include($$QTWEBENGINE_OUT_ROOT/src/buildtools/qtbuildtools-config.pri) - QT_FOR_CONFIG += buildtools-private gui-private +defineReplace(qtwebengine_checkError) { static { qtwebengine_skipBuild("Static builds of QtWebEngine are not supported.") @@ -277,3 +274,9 @@ defineTest(qtwebengine_checkErrorForWindows) { } return(true) } + +defineTest(qtwebengine_makeCheckError) { + include($$QTWEBENGINE_OUT_ROOT/src/buildtools/qtbuildtools-config.pri) + QT_FOR_CONFIG += buildtools-private gui-private + return($$qtwebengine_checkError()) +} |