diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-09-12 10:00:03 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-12 20:19:28 +0200 |
| commit | 2f71cdff2cda7903fd0b5ff0033d790877e40181 (patch) | |
| tree | 0255e40f5366123bedefcbc9ad7d482f2e8198a2 /qtwebengine.pro | |
| parent | d91b839d67bcfa1cfeb3d095b6885c97c53b9812 (diff) | |
| parent | 5b0bbd7345b698faab0116b821802fb4a30c0fa4 (diff) | |
| download | qtwebengine-wip/qt6.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.14' into wip/qt6"wip/qt6
Diffstat (limited to 'qtwebengine.pro')
| -rw-r--r-- | qtwebengine.pro | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/qtwebengine.pro b/qtwebengine.pro index 620f451f1..6d4089b26 100644 --- a/qtwebengine.pro +++ b/qtwebengine.pro @@ -1,13 +1,6 @@ load(qt_parts) -load(configure) - -runConfigure() - -!isEmpty(skipBuildReason) { - SUBDIRS = - log($${skipBuildReason}$${EOL}) - log(QtWebEngine will not be built.$${EOL}) -} +load(functions) +load(platform) QMAKE_DISTCLEAN += .qmake.cache @@ -20,3 +13,7 @@ OTHER_FILES = \ config.tests/snappy/* \ config.tests/re2/* \ mkspecs/features/* + +!isWebEngineCoreBuild():!isEmpty(skipBuildReason):!build_pass { + log(QtWebEngine will not be built. $${skipBuildReason} $${EOL}) +} |