diff options
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/src/src.pro b/src/src.pro index 99967fd82..de88878a6 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,16 +1,18 @@ -load(platform) +load(functions) include($$QTWEBENGINE_OUT_ROOT/src/buildtools/qtbuildtools-config.pri) -QT_FOR_CONFIG += buildtools-private +include($$QTWEBENGINE_OUT_ROOT/src/core/qtwebenginecore-config.pri) +include($$QTWEBENGINE_OUT_ROOT/src/webengine/qtwebengine-config.pri) +include($$QTWEBENGINE_OUT_ROOT/src/webenginewidgets/qtwebenginewidgets-config.pri) + +QT_FOR_CONFIG += buildtools-private webenginecore webenginecore-private webengine-private \ + webenginewidgets-private TEMPLATE = subdirs -isWebEngineCoreBuild():qtConfig(webengine-core) { - include($$QTWEBENGINE_OUT_ROOT/src/core/qtwebenginecore-config.pri) - include($$QTWEBENGINE_OUT_ROOT/src/webengine/qtwebengine-config.pri) - include($$QTWEBENGINE_OUT_ROOT/src/webenginewidgets/qtwebenginewidgets-config.pri) - QT_FOR_CONFIG += webenginecore webenginecore-private webengine-private webenginewidgets-private +qtConfig(build-qtwebengine-core):qtConfig(webengine-core-support) { + core.depends = buildtools process.depends = core webengine.depends = core webenginewidgets.depends = core webengine @@ -18,16 +20,12 @@ isWebEngineCoreBuild():qtConfig(webengine-core) { webengine_plugin.target = sub-webengine-plugin webengine_plugin.depends = webengine - core.depends = buildtools - - SUBDIRS += buildtools \ - core \ - process + SUBDIRS += buildtools core process qtConfig(webengine-spellchecker):!qtConfig(webengine-native-spellchecker):!cross_compile { - SUBDIRS += qwebengine_convert_dict - qwebengine_convert_dict.subdir = tools/qwebengine_convert_dict - qwebengine_convert_dict.depends = core + SUBDIRS += qwebengine_convert_dict + qwebengine_convert_dict.subdir = tools/qwebengine_convert_dict + qwebengine_convert_dict.depends = core } qtConfig(webengine-qml) { @@ -38,13 +36,14 @@ isWebEngineCoreBuild():qtConfig(webengine-core) { SUBDIRS += plugins webenginewidgets plugins.depends = webenginewidgets } -} else { - !isEmpty(skipBuildReason):!build_pass { - log(QtWebEngine will not be built. $${skipBuildReason} $${EOL}) - errorbuild.commands = @echo QtWebEngine will not be built. $${skipBuildReason} - errorbuild.CONFIG = phony - QMAKE_EXTRA_TARGETS += errorbuild - first.depends += errorbuild - QMAKE_EXTRA_TARGETS += first - } +} + +!qtConfig(webengine-core-support): qtConfig(build-qtwebengine-core) { + !qtwebengine_makeCheckError():!isEmpty(skipBuildReason):!build_pass { + errorbuild.commands = @echo Modules will not be built. $${skipBuildReason} + errorbuild.CONFIG = phony + QMAKE_EXTRA_TARGETS += errorbuild + first.depends += errorbuild + QMAKE_EXTRA_TARGETS += first + } } |