diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2019-09-06 20:26:13 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2019-09-19 06:11:29 +0200 |
| commit | 8852c18bbeef4d21683c77d745e9934aff5c5025 (patch) | |
| tree | ce1e19049719f5aa1a9f4c716b0aa286249d39b8 /src/src.pro | |
| parent | 44a1cc1c2e38cbde5547d8fa7df168fcf5360bc7 (diff) | |
Rename option webengine-core to build-qtwebengine-core
This change is extracted from qtpdf branch to keep following
commits unchanged.
Change-Id: I255976d45213d4cfe84243cae0b4eddb8eb1747a
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 65 |
1 files changed, 33 insertions, 32 deletions
diff --git a/src/src.pro b/src/src.pro index 99967fd82..e620fcdd8 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,42 +1,43 @@ load(platform) 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 - - process.depends = core - webengine.depends = core - webenginewidgets.depends = core webengine - webengine_plugin.subdir = webengine/plugin - webengine_plugin.target = sub-webengine-plugin - webengine_plugin.depends = webengine - - core.depends = buildtools - - 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 - } +isWebEngineCoreBuild(){ - qtConfig(webengine-qml) { - SUBDIRS += webengine - } + qtConfig(build-qtwebengine-core) { + + core.depends = buildtools + process.depends = core + webengine.depends = core + webenginewidgets.depends = core webengine + webengine_plugin.subdir = webengine/plugin + webengine_plugin.target = sub-webengine-plugin + webengine_plugin.depends = webengine - qtConfig(webengine-widgets) { - SUBDIRS += plugins webenginewidgets - plugins.depends = webenginewidgets + 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 + } + + qtConfig(webengine-qml) { + SUBDIRS += webengine + } + + qtConfig(webengine-widgets) { + SUBDIRS += plugins webenginewidgets + plugins.depends = webenginewidgets + } } } else { !isEmpty(skipBuildReason):!build_pass { @@ -46,5 +47,5 @@ isWebEngineCoreBuild():qtConfig(webengine-core) { QMAKE_EXTRA_TARGETS += errorbuild first.depends += errorbuild QMAKE_EXTRA_TARGETS += first - } + } } |