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/src.pro | |
| 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/src.pro')
| -rw-r--r-- | src/src.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/src.pro b/src/src.pro index adb26efdc..de88878a6 100644 --- a/src/src.pro +++ b/src/src.pro @@ -39,7 +39,7 @@ qtConfig(build-qtwebengine-core):qtConfig(webengine-core-support) { } !qtConfig(webengine-core-support): qtConfig(build-qtwebengine-core) { - !qtwebengine_checkError():!isEmpty(skipBuildReason):!build_pass { + !qtwebengine_makeCheckError():!isEmpty(skipBuildReason):!build_pass { errorbuild.commands = @echo Modules will not be built. $${skipBuildReason} errorbuild.CONFIG = phony QMAKE_EXTRA_TARGETS += errorbuild |