diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2021-02-10 12:02:57 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2021-04-13 09:32:55 +0200 |
| commit | 919dd97e835f469609a0710eb91f829a6d70e88c (patch) | |
| tree | 90c9044585d8f9b71776a4cbf1f4ef4a34a7076b /src/src.pro | |
| parent | 29d45bf2d105b43d8cedc923869960091771d2a1 (diff) | |
Fix 'WebEngine' ambiguity for Qt6
'WebEngine' is a qml module, however name itself
is ambiguous. Thefore now with Qt6 and with cmake
port name the module as WebEngineQuick.
Change-Id: I948672dd5d389a01c6a31ec871459164fd989c0f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/src.pro b/src/src.pro index 143fd00ab..3edec57ca 100644 --- a/src/src.pro +++ b/src/src.pro @@ -2,7 +2,7 @@ load(functions) include($$QTWEBENGINE_OUT_ROOT/src/buildtools/qtbuildtools-config.pri) include($$QTWEBENGINE_OUT_ROOT/src/core/qtwebenginecore-config.pri) -include($$QTWEBENGINE_OUT_ROOT/src/webengine/qtwebengine-config.pri) +include($$QTWEBENGINE_OUT_ROOT/src/webenginequick/qtwebenginequick-config.pri) include($$QTWEBENGINE_OUT_ROOT/src/webenginewidgets/qtwebenginewidgets-config.pri) include($$QTWEBENGINE_OUT_ROOT/src/pdf/qtpdf-config.pri) include($$QTWEBENGINE_OUT_ROOT/src/pdfwidgets/qtpdfwidgets-config.pri) @@ -11,7 +11,9 @@ QT_FOR_CONFIG += \ buildtools-private \ webenginecore \ webenginecore-private \ - webengine-private \ + webenginequick \ + webenginequick-private \ + webenginewidgets \ webenginewidgets-private \ pdf-private \ pdfwidgets-private @@ -21,11 +23,11 @@ TEMPLATE = subdirs qtConfig(build-qtwebengine-core):qtConfig(webengine-core-support) { 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 + webenginequick.depends = core + webenginewidgets.depends = core webenginequick + webenginequick_plugin.subdir = webenginequick/plugin + webenginequick_plugin.target = sub-webenginequick-plugin + webenginequick_plugin.depends = webenginequick SUBDIRS += buildtools core process @@ -35,8 +37,8 @@ qtConfig(build-qtwebengine-core):qtConfig(webengine-core-support) { qwebengine_convert_dict.depends = core } - qtConfig(webengine-qml) { - SUBDIRS += webengine + qtConfig(webengine-quick) { + SUBDIRS += webenginequick } qtConfig(webengine-widgets) { |