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>

31 files changed, 46 insertions, 46 deletions

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 53f223642..257c7b387 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -1,13 +1,14 @@
 
 include($$QTWEBENGINE_OUT_ROOT/src/buildtools/qtbuildtools-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)
 
 QT_FOR_CONFIG += \
     buildtools-private \
-    webengine-private \
+    webenginecore-private \
+    webenginequick-private \
     webenginewidgets-private \
     pdf-private \
     pdfwidgets-private
@@ -15,7 +16,7 @@ QT_FOR_CONFIG += \
 TEMPLATE = subdirs
 
 qtConfig(build-qtwebengine-core):qtConfig(webengine-core-support) {
-    qtConfig(webengine-qml): SUBDIRS += quick
+    qtConfig(webengine-quick): SUBDIRS += quick
     qtConfig(webengine-widgets): SUBDIRS += core widgets
 }
 
diff --git a/tests/auto/quick/certificateerror/certificateerror.pro b/tests/auto/quick/certificateerror/certificateerror.pro
index 27d5a3cc1..22c1275e6 100644
--- a/tests/auto/quick/certificateerror/certificateerror.pro
+++ b/tests/auto/quick/certificateerror/certificateerror.pro
@@ -1,6 +1,6 @@
 include(../tests.pri)
 include(../../shared/https.pri)
-QT *= webenginecore-private webengine webengine-private
+QT *= webenginecore-private webenginequick webenginequick-private
 HEADERS += $$PWD/testhandler.h
 SOURCES += $$PWD/testhandler.cpp
 RESOURCES += certificateerror.qrc
diff --git a/tests/auto/quick/dialogs/dialogs.pro b/tests/auto/quick/dialogs/dialogs.pro
index 29d509b20..79952d8ee 100644
--- a/tests/auto/quick/dialogs/dialogs.pro
+++ b/tests/auto/quick/dialogs/dialogs.pro
@@ -1,5 +1,5 @@
 include(../tests.pri)
-QT += core-private webengine webengine-private
+QT += core-private webenginequick webenginequick-private
 
 HEADERS += \
     server.h \
diff --git a/tests/auto/quick/dialogs/tst_dialogs.cpp b/tests/auto/quick/dialogs/tst_dialogs.cpp
index 8f2e79d3b..97a39ed01 100644
--- a/tests/auto/quick/dialogs/tst_dialogs.cpp
+++ b/tests/auto/quick/dialogs/tst_dialogs.cpp
@@ -30,7 +30,7 @@
 #include "server.h"
 #include "util.h"
 
-#include <QtWebEngine/private/qquickwebenginedialogrequests_p.h>
+#include <QtWebEngineQuick/private/qquickwebenginedialogrequests_p.h>
 #include <QtWebEngineCore/qwebenginecontextmenurequest.h>
 #include <QQuickWebEngineProfile>
 
diff --git a/tests/auto/quick/inspectorserver/inspectorserver.pro b/tests/auto/quick/inspectorserver/inspectorserver.pro
index fdc213f38..5110a3ae9 100644
--- a/tests/auto/quick/inspectorserver/inspectorserver.pro
+++ b/tests/auto/quick/inspectorserver/inspectorserver.pro
@@ -1,4 +1,4 @@
 include(../tests.pri)
-QT += webengine
-QT_PRIVATE += core-private webengine-private webenginecore-private
+QT += webenginequick
+QT_PRIVATE += core-private webenginequick-private webenginecore-private
 DEFINES += IMPORT_DIR=\"\\\"$${ROOT_BUILD_DIR}$${QMAKE_DIR_SEP}imports\\\"\"
diff --git a/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp b/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
index a3c118695..bc5aed9ef 100644
--- a/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
+++ b/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
@@ -33,7 +33,7 @@
 #include <QtQml/QQmlEngine>
 #include <QtTest/QtTest>
 #include <QQuickWebEngineProfile>
-#include <QtWebEngine/private/qquickwebengineview_p.h>
+#include <QtWebEngineQuick/private/qquickwebengineview_p.h>
 
 #define INSPECTOR_SERVER_PORT "23654"
 static const QUrl s_inspectorServerHttpBaseUrl("http://localhost:" INSPECTOR_SERVER_PORT);
diff --git a/tests/auto/quick/publicapi/publicapi.pro b/tests/auto/quick/publicapi/publicapi.pro
index c56fd2503..bb0e03f65 100644
--- a/tests/auto/quick/publicapi/publicapi.pro
+++ b/tests/auto/quick/publicapi/publicapi.pro
@@ -1,3 +1,3 @@
 include(../tests.pri)
-QT += webengine
-QT_PRIVATE += core-private webengine-private webenginecore-private
+QT += webenginequick
+QT_PRIVATE += core-private webenginequick-private webenginecore-private
diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp
index ba76ad757..a4c478991 100644
--- a/tests/auto/quick/publicapi/tst_publicapi.cpp
+++ b/tests/auto/quick/publicapi/tst_publicapi.cpp
@@ -33,7 +33,7 @@
 #include <QMetaType>
 #include <QQmlListProperty>
 #include <QtTest/QtTest>
-#include <QtWebEngine/QQuickWebEngineProfile>
+#include <QtWebEngineQuick/QQuickWebEngineProfile>
 #include <QtWebEngineCore/QWebEngineCertificateError>
 #include <QtWebEngineCore/QWebEngineFindTextResult>
 #include <QtWebEngineCore/QWebEngineFullScreenRequest>
@@ -754,7 +754,7 @@ static const QStringList expectedAPI = QStringList()
     << "QQuickWebEngineView.setActiveFocusOnPress(bool) --> void"
     << "QQuickWebEngineView.settings --> QQuickWebEngineSettings*"
     << "QQuickWebEngineView.stop() --> void"
-#if QT_CONFIG(webengine_testsupport)
+#if QT_CONFIG(webenginequick_testsupport)
     << "QQuickWebEngineView.testSupport --> QQuickWebEngineTestSupport*"
     << "QQuickWebEngineView.testSupportChanged() --> void"
 #endif
diff --git a/tests/auto/quick/qmltests/qmltests.pro b/tests/auto/quick/qmltests/qmltests.pro
index cc55c1471..984d41064 100644
--- a/tests/auto/quick/qmltests/qmltests.pro
+++ b/tests/auto/quick/qmltests/qmltests.pro
@@ -1,5 +1,5 @@
-include($$QTWEBENGINE_OUT_ROOT/src/webengine/qtwebengine-config.pri) # workaround for QTBUG-68093
-QT_FOR_CONFIG += webengine-private
+include($$QTWEBENGINE_OUT_ROOT/src/webenginequick/qtwebenginequick-config.pri) # workaround for QTBUG-68093
+QT_FOR_CONFIG += webenginequick-private
 
 include(../tests.pri)
 
@@ -49,7 +49,7 @@ qtConfig(ssl) {
     include(../../shared/http.pri)
 }
 
-qtConfig(webengine-testsupport) {
+qtConfig(webenginequick-testsupport) {
     QML_TESTS += \
         $$PWD/data/tst_favicon.qml \
         $$PWD/data/tst_faviconDownload.qml \
diff --git a/tests/auto/quick/qmltests/tst_qmltests.cpp b/tests/auto/quick/qmltests/tst_qmltests.cpp
index 8423df1bd..906de29ad 100644
--- a/tests/auto/quick/qmltests/tst_qmltests.cpp
+++ b/tests/auto/quick/qmltests/tst_qmltests.cpp
@@ -35,7 +35,7 @@
 #include <QtCore/QScopedPointer>
 #include <QTemporaryDir>
 #include <QtQuickTest/quicktest.h>
-#include <QtWebEngine/QQuickWebEngineProfile>
+#include <QtWebEngineQuick/QQuickWebEngineProfile>
 #include <QQmlEngine>
 #include "qt_webengine_quicktest.h"
 
diff --git a/tests/auto/quick/qquickwebenginedefaultsurfaceformat/qquickwebenginedefaultsurfaceformat.pro b/tests/auto/quick/qquickwebenginedefaultsurfaceformat/qquickwebenginedefaultsurfaceformat.pro
index 699186741..092973032 100644
--- a/tests/auto/quick/qquickwebenginedefaultsurfaceformat/qquickwebenginedefaultsurfaceformat.pro
+++ b/tests/auto/quick/qquickwebenginedefaultsurfaceformat/qquickwebenginedefaultsurfaceformat.pro
@@ -1,6 +1,6 @@
 include(../tests.pri)
 
 exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc
-QT_PRIVATE += core-private webengine-private webenginecore-private
+QT_PRIVATE += core-private webenginequick-private webenginecore-private
 
 HEADERS += ../shared/util.h
diff --git a/tests/auto/quick/qquickwebengineprofile/tst_qquickwebengineprofile.cpp b/tests/auto/quick/qquickwebengineprofile/tst_qquickwebengineprofile.cpp
index db7c2ad6e..ea0469aef 100644
--- a/tests/auto/quick/qquickwebengineprofile/tst_qquickwebengineprofile.cpp
+++ b/tests/auto/quick/qquickwebengineprofile/tst_qquickwebengineprofile.cpp
@@ -28,7 +28,7 @@
 
 #include <QtQml/QQmlEngine>
 #include <QtTest/QtTest>
-#include <QtWebEngine/QQuickWebEngineProfile>
+#include <QtWebEngineQuick/QQuickWebEngineProfile>
 
 class tst_QQuickWebEngineProfile : public QObject {
     Q_OBJECT
diff --git a/tests/auto/quick/qquickwebengineview/qquickwebengineview.pro b/tests/auto/quick/qquickwebengineview/qquickwebengineview.pro
index 38c130aa3..ba3737108 100644
--- a/tests/auto/quick/qquickwebengineview/qquickwebengineview.pro
+++ b/tests/auto/quick/qquickwebengineview/qquickwebengineview.pro
@@ -1,6 +1,6 @@
 include(../tests.pri)
 
 exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc
-QT_PRIVATE += core_private gui-private webengine-private webenginecore-private
+QT_PRIVATE += core_private gui-private webenginequick-private webenginecore-private
 
 HEADERS += ../shared/util.h
diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
index 005dd2dd3..30441ac11 100644
--- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
+++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
@@ -37,11 +37,11 @@
 #include <QtGui/qpa/qwindowsysteminterface.h>
 #include <QtQml/QQmlEngine>
 #include <QtTest/QtTest>
-#include <QtWebEngine/QQuickWebEngineProfile>
-#include <QtWebEngine/QQuickWebEngineScriptCollection>
+#include <QtWebEngineQuick/QQuickWebEngineProfile>
+#include <QtWebEngineQuick/QQuickWebEngineScriptCollection>
 #include <QtGui/private/qinputmethod_p.h>
-#include <QtWebEngine/private/qquickwebengineview_p.h>
-#include <QtWebEngine/private/qquickwebenginesettings_p.h>
+#include <QtWebEngineQuick/private/qquickwebengineview_p.h>
+#include <QtWebEngineQuick/private/qquickwebenginesettings_p.h>
 #include <QtWebEngineCore/private/qtwebenginecore-config_p.h>
 #include <qpa/qplatforminputcontext.h>
 
diff --git a/tests/auto/quick/qquickwebengineviewgraphics/qquickwebengineviewgraphics.pro b/tests/auto/quick/qquickwebengineviewgraphics/qquickwebengineviewgraphics.pro
index a0ee3fd89..be6296f5e 100644
--- a/tests/auto/quick/qquickwebengineviewgraphics/qquickwebengineviewgraphics.pro
+++ b/tests/auto/quick/qquickwebengineviewgraphics/qquickwebengineviewgraphics.pro
@@ -1,4 +1,4 @@
 include(../tests.pri)
 CONFIG -= testcase      # remove, once this passes in the CI
 exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc
-QT_PRIVATE += webengine-private gui-private webenginecore-private
+QT_PRIVATE += webenginequick-private gui-private webenginecore-private
diff --git a/tests/auto/quick/qtbug-70248/qtbug-70248.pro b/tests/auto/quick/qtbug-70248/qtbug-70248.pro
index e1b18bc16..7223dcfa0 100644
--- a/tests/auto/quick/qtbug-70248/qtbug-70248.pro
+++ b/tests/auto/quick/qtbug-70248/qtbug-70248.pro
@@ -1,5 +1,5 @@
 include(../tests.pri)
-QT += webengine webengine-private
+QT += webenginequick webenginequick-private
 
 RESOURCES += \
     test.qrc
diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro
index 4648b2f64..1c1bf2ba9 100644
--- a/tests/auto/quick/quick.pro
+++ b/tests/auto/quick/quick.pro
@@ -1,5 +1,5 @@
-include($$QTWEBENGINE_OUT_ROOT/src/webengine/qtwebengine-config.pri) # workaround for QTBUG-68093
-QT_FOR_CONFIG += webengine-private
+include($$QTWEBENGINE_OUT_ROOT/src/webenginequick/qtwebenginequick-config.pri) # workaround for QTBUG-68093
+QT_FOR_CONFIG += webenginequick-private
 
 TEMPLATE = subdirs
 
@@ -13,7 +13,7 @@ SUBDIRS += \
     qtbug-70248 \
     certificateerror
 
-qtConfig(webengine-testsupport) {
+qtConfig(webenginequick-testsupport) {
     SUBDIRS += qquickwebengineviewgraphics
 }
 
diff --git a/tests/auto/quick/shared/util.h b/tests/auto/quick/shared/util.h
index 910522b32..34afbbb45 100644
--- a/tests/auto/quick/shared/util.h
+++ b/tests/auto/quick/shared/util.h
@@ -34,8 +34,9 @@
 #include <QSignalSpy>
 #include <QTimer>
 #include <QtTest/QtTest>
-#include <QtWebEngine/private/qquickwebengineview_p.h>
+#include <QtWebEngineQuick/private/qquickwebengineview_p.h>
 #include <QtWebEngineCore/QWebEngineLoadRequest>
+#include <QtWebEngineQuick/private/qquickwebengineview_p.h>
 #include <QGuiApplication>
 
 #if !defined(TESTS_SOURCE_DIR)
diff --git a/tests/auto/quick/tests.pri b/tests/auto/quick/tests.pri
index 1bf69da43..8cf4c0af5 100644
--- a/tests/auto/quick/tests.pri
+++ b/tests/auto/quick/tests.pri
@@ -1,5 +1,5 @@
-include($$QTWEBENGINE_OUT_ROOT/src/webengine/qtwebengine-config.pri) # workaround for QTBUG-68093
-QT_FOR_CONFIG += webengine-private
+include($$QTWEBENGINE_OUT_ROOT/src/webenginequick/qtwebenginequick-config.pri) # workaround for QTBUG-68093
+QT_FOR_CONFIG += webenginequick-private
 
 TEMPLATE = app
 
@@ -13,7 +13,7 @@ INCLUDEPATH += \
     $$PWD \
     ../shared
 
-QT += testlib network quick webengine
+QT += testlib network quick webenginequick
 
 # This define is used by some tests to look up resources in the source tree
 DEFINES += TESTS_SOURCE_DIR=\\\"$$PWD/\\\"
diff --git a/tests/auto/widgets/offscreen/offscreen.pro b/tests/auto/widgets/offscreen/offscreen.pro
index b8e5632f9..2469f9a53 100644
--- a/tests/auto/widgets/offscreen/offscreen.pro
+++ b/tests/auto/widgets/offscreen/offscreen.pro
@@ -1,5 +1,5 @@
 include(../tests.pri)
-QT += webengine
+QT += webenginewidgets
 qpa.name = QT_QPA_PLATFORM
 qpa.value = offscreen
 QT_TOOL_ENV += qpa
diff --git a/tests/auto/widgets/offscreen/tst_offscreen.cpp b/tests/auto/widgets/offscreen/tst_offscreen.cpp
index 7573b0537..81cbe95f3 100644
--- a/tests/auto/widgets/offscreen/tst_offscreen.cpp
+++ b/tests/auto/widgets/offscreen/tst_offscreen.cpp
@@ -26,7 +26,6 @@
 **
 ****************************************************************************/
 
-#include "qtwebengineglobal.h"
 #include <QTest>
 #include <QSignalSpy>
 #include <QWebEngineProfile>
diff --git a/tests/auto/widgets/proxy/proxy.pro b/tests/auto/widgets/proxy/proxy.pro
index 802dfad05..ce4ccbfcb 100644
--- a/tests/auto/widgets/proxy/proxy.pro
+++ b/tests/auto/widgets/proxy/proxy.pro
@@ -1,5 +1,5 @@
 include(../tests.pri)
-QT += core-private webengine webengine-private
+QT += core-private webenginewidgets webenginewidgets-private
 
 HEADERS += \
     proxy_server.h
diff --git a/tests/auto/widgets/proxypac/proxypac.pri b/tests/auto/widgets/proxypac/proxypac.pri
index b3b2856c8..f9f23da6f 100644
--- a/tests/auto/widgets/proxypac/proxypac.pri
+++ b/tests/auto/widgets/proxypac/proxypac.pri
@@ -1,5 +1,5 @@
 TEMPLATE = app
 CONFIG += testcase
-QT += testlib network webenginewidgets webengine
+QT += testlib network webenginewidgets webenginecore
 HEADERS += $$PWD/proxyserver.h
 SOURCES += $$PWD/proxyserver.cpp $$PWD/tst_proxypac.cpp
diff --git a/tests/auto/widgets/proxypac/tst_proxypac.cpp b/tests/auto/widgets/proxypac/tst_proxypac.cpp
index dabbfb4e5..26f9b8aa3 100644
--- a/tests/auto/widgets/proxypac/tst_proxypac.cpp
+++ b/tests/auto/widgets/proxypac/tst_proxypac.cpp
@@ -26,7 +26,6 @@
 **
 ****************************************************************************/
 
-#include "qtwebengineglobal.h"
 #include "proxyserver.h"
 #include <QTest>
 #include <QSignalSpy>
diff --git a/tests/manual/quick/faviconbrowser/faviconbrowser.pro b/tests/manual/quick/faviconbrowser/faviconbrowser.pro
index d4368ab3e..d997d6322 100644
--- a/tests/manual/quick/faviconbrowser/faviconbrowser.pro
+++ b/tests/manual/quick/faviconbrowser/faviconbrowser.pro
@@ -1,4 +1,4 @@
-QT += qml quick webengine
+QT += qml quick webenginequick
 qtHaveModule(widgets) {
     QT += widgets # QApplication is required to get native styling with QtQuickControls
 }
diff --git a/tests/manual/quick/faviconbrowser/main.cpp b/tests/manual/quick/faviconbrowser/main.cpp
index 976d68568..d1faadfa0 100644
--- a/tests/manual/quick/faviconbrowser/main.cpp
+++ b/tests/manual/quick/faviconbrowser/main.cpp
@@ -37,7 +37,7 @@ typedef QGuiApplication Application;
 #endif
 #include <QtQml/QQmlApplicationEngine>
 #include <QtQml/QQmlContext>
-#include <QtWebEngine/qtwebengineglobal.h>
+#include <QtWebEngineQuick/qtwebengineglobal.h>
 
 int main(int argc, char **argv)
 {
diff --git a/tests/manual/quick/touchbrowser/main.cpp b/tests/manual/quick/touchbrowser/main.cpp
index 5808fe167..cc83b675a 100644
--- a/tests/manual/quick/touchbrowser/main.cpp
+++ b/tests/manual/quick/touchbrowser/main.cpp
@@ -35,7 +35,7 @@
 #include <QtQml/QQmlApplicationEngine>
 #include <QtQml/QQmlContext>
 #include <QtQuick/QQuickView>
-#include <QtWebEngine/qtwebengineglobal.h>
+#include <QtWebEngineQuick/qtwebengineglobal.h>
 
 static QUrl startupUrl()
 {
diff --git a/tests/manual/quick/touchbrowser/touchbrowser.pro b/tests/manual/quick/touchbrowser/touchbrowser.pro
index 21e3d6f68..92e4e6703 100644
--- a/tests/manual/quick/touchbrowser/touchbrowser.pro
+++ b/tests/manual/quick/touchbrowser/touchbrowser.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 
-QT += quick webengine
+QT += quick webenginequick
 CONFIG += c++11
 
 SOURCES += \
diff --git a/tests/quicktestbrowser/main.cpp b/tests/quicktestbrowser/main.cpp
index b886564f3..9dc0c2dee 100644
--- a/tests/quicktestbrowser/main.cpp
+++ b/tests/quicktestbrowser/main.cpp
@@ -38,8 +38,8 @@ typedef QGuiApplication Application;
 #include <QtQml/QQmlApplicationEngine>
 #include <QtQml/QQmlContext>
 #include <QtQml/QQmlComponent>
-#include <QtWebEngine/qtwebengineglobal.h>
-#include <QtWebEngine/QQuickWebEngineProfile>
+#include <QtWebEngineQuick/qtwebengineglobal.h>
+#include <QtWebEngineQuick/QQuickWebEngineProfile>
 #include <QtWebEngineCore/qwebenginecookiestore.h>
 
 static QUrl startupUrl()
diff --git a/tests/quicktestbrowser/quicktestbrowser.pro b/tests/quicktestbrowser/quicktestbrowser.pro
index 8c6b8a111..304135836 100644
--- a/tests/quicktestbrowser/quicktestbrowser.pro
+++ b/tests/quicktestbrowser/quicktestbrowser.pro
@@ -19,7 +19,7 @@ OTHER_FILES += ApplicationRoot.qml \
 
 RESOURCES += resources.qrc
 
-QT += qml quick webengine
+QT += qml quick webenginequick
 
 qtHaveModule(widgets) {
     QT += widgets # QApplication is required to get native styling with QtQuickControls
diff --git a/tests/tests.pro b/tests/tests.pro
index acb223640..cb7d78798 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -2,6 +2,6 @@ TEMPLATE = subdirs
 
 SUBDIRS +=  auto
 
-qtHaveModule(webengine) {
+qtHaveModule(webengine-quick) {
     SUBDIRS += quicktestbrowser
 }