151 files changed, 136 insertions, 134 deletions

diff --git a/configure.json b/configure.json
index a5dbad35b..ab8153508 100644
--- a/configure.json
+++ b/configure.json
@@ -2,7 +2,7 @@
     "subconfigs": [
         "src/buildtools",
         "src/core",
-        "src/webengine",
+        "src/webenginequick",
         "src/webenginewidgets",
         "src/pdf",
         "src/pdfwidgets"
diff --git a/examples/examples.pro b/examples/examples.pro
index a0245a869..f36b98904 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,13 +1,13 @@
 
 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 \
+     webenginequick-private \
      webenginewidgets-private \
      pdf-private \
      pdfwidgets-private
@@ -15,7 +15,7 @@ QT_FOR_CONFIG += \
 TEMPLATE=subdirs
 
 qtConfig(build-qtwebengine-core):qtConfig(webengine-core-support) {
-    qtConfig(webengine-qml): SUBDIRS += webengine
+    qtConfig(webengine-quick): SUBDIRS += webengine
     qtConfig(webengine-widgets): SUBDIRS += webenginewidgets
 }
 
diff --git a/examples/webengine/customdialogs/customdialogs.pro b/examples/webengine/customdialogs/customdialogs.pro
index 5861f3af7..8555318ad 100644
--- a/examples/webengine/customdialogs/customdialogs.pro
+++ b/examples/webengine/customdialogs/customdialogs.pro
@@ -1,4 +1,4 @@
-QT += webengine
+QT += webenginequick
 
 HEADERS += \
     server.h
diff --git a/examples/webengine/lifecycle/lifecycle.pro b/examples/webengine/lifecycle/lifecycle.pro
index 74fbf23c1..6e807eb3d 100644
--- a/examples/webengine/lifecycle/lifecycle.pro
+++ b/examples/webengine/lifecycle/lifecycle.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 
-QT += quickcontrols2 webengine
+QT += quickcontrols2 webenginequick
 
 SOURCES += main.cpp
 
diff --git a/examples/webengine/minimal/minimal.pro b/examples/webengine/minimal/minimal.pro
index 23ce01d5b..9ec75318a 100644
--- a/examples/webengine/minimal/minimal.pro
+++ b/examples/webengine/minimal/minimal.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 
-QT += webengine
+QT += webenginequick
 
 SOURCES += main.cpp
 
diff --git a/examples/webengine/quicknanobrowser/main.cpp b/examples/webengine/quicknanobrowser/main.cpp
index d09abba3c..f804c0d14 100644
--- a/examples/webengine/quicknanobrowser/main.cpp
+++ b/examples/webengine/quicknanobrowser/main.cpp
@@ -59,7 +59,7 @@ typedef QGuiApplication Application;
 #endif
 #include <QtQml/QQmlApplicationEngine>
 #include <QtQml/QQmlContext>
-#include <QtWebEngine/qtwebengineglobal.h>
+#include <QtWebEngineQuick/qtwebengineglobal.h>
 
 static QUrl startupUrl()
 {
diff --git a/examples/webengine/quicknanobrowser/quicknanobrowser.pro b/examples/webengine/quicknanobrowser/quicknanobrowser.pro
index 922cf79e2..6217f2ef5 100644
--- a/examples/webengine/quicknanobrowser/quicknanobrowser.pro
+++ b/examples/webengine/quicknanobrowser/quicknanobrowser.pro
@@ -15,7 +15,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/examples/webengine/recipebrowser/recipebrowser.pro b/examples/webengine/recipebrowser/recipebrowser.pro
index 2c2145fc6..3926a136c 100644
--- a/examples/webengine/recipebrowser/recipebrowser.pro
+++ b/examples/webengine/recipebrowser/recipebrowser.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 
-QT += quick qml quickcontrols2 webengine
+QT += quick qml quickcontrols2 webenginequick
 
 cross_compile {
   posix|qnx|linux: DEFINES += QTWEBENGINE_RECIPE_BROWSER_EMBEDDED
diff --git a/examples/webengine/webengineaction/webengineaction.pro b/examples/webengine/webengineaction/webengineaction.pro
index 13cc4602d..aeed568fb 100644
--- a/examples/webengine/webengineaction/webengineaction.pro
+++ b/examples/webengine/webengineaction/webengineaction.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 
-QT += webengine
+QT += webenginequick
 
 SOURCES += main.cpp
 
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) {
diff --git a/src/webengine/api/qquickwebengineaction.cpp b/src/webenginequick/api/qquickwebengineaction.cpp
index 77ac8d340..77ac8d340 100644
--- a/src/webengine/api/qquickwebengineaction.cpp
+++ b/src/webenginequick/api/qquickwebengineaction.cpp
diff --git a/src/webengine/api/qquickwebengineaction_p.h b/src/webenginequick/api/qquickwebengineaction_p.h
index 8f5f3386c..8f5f3386c 100644
--- a/src/webengine/api/qquickwebengineaction_p.h
+++ b/src/webenginequick/api/qquickwebengineaction_p.h
diff --git a/src/webengine/api/qquickwebengineaction_p_p.h b/src/webenginequick/api/qquickwebengineaction_p_p.h
index d2ead30e9..d2ead30e9 100644
--- a/src/webengine/api/qquickwebengineaction_p_p.h
+++ b/src/webenginequick/api/qquickwebengineaction_p_p.h
diff --git a/src/webengine/api/qquickwebengineclientcertificateselection.cpp b/src/webenginequick/api/qquickwebengineclientcertificateselection.cpp
index 4d8b38427..4d8b38427 100644
--- a/src/webengine/api/qquickwebengineclientcertificateselection.cpp
+++ b/src/webenginequick/api/qquickwebengineclientcertificateselection.cpp
diff --git a/src/webengine/api/qquickwebengineclientcertificateselection_p.h b/src/webenginequick/api/qquickwebengineclientcertificateselection_p.h
index ef29fb049..a62150404 100644
--- a/src/webengine/api/qquickwebengineclientcertificateselection_p.h
+++ b/src/webenginequick/api/qquickwebengineclientcertificateselection_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtWebEngine/private/qtwebengineglobal_p.h>
+#include <QtWebEngineQuick/private/qtwebengineglobal_p.h>
 
 #include <QtCore/QDateTime>
 #include <QtCore/QObject>
diff --git a/src/webengine/api/qquickwebenginedialogrequests.cpp b/src/webenginequick/api/qquickwebenginedialogrequests.cpp
index da1aecaf6..da1aecaf6 100644
--- a/src/webengine/api/qquickwebenginedialogrequests.cpp
+++ b/src/webenginequick/api/qquickwebenginedialogrequests.cpp
diff --git a/src/webengine/api/qquickwebenginedialogrequests_p.h b/src/webenginequick/api/qquickwebenginedialogrequests_p.h
index 5e3f7c547..f3b5997d0 100644
--- a/src/webengine/api/qquickwebenginedialogrequests_p.h
+++ b/src/webenginequick/api/qquickwebenginedialogrequests_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtWebEngine/private/qtwebengineglobal_p.h>
+#include <QtWebEngineQuick/private/qtwebengineglobal_p.h>
 #include <QtCore/QUrl>
 #include <QtCore/QWeakPointer>
 #include <QtCore/QRect>
diff --git a/src/webengine/api/qquickwebenginefaviconprovider.cpp b/src/webenginequick/api/qquickwebenginefaviconprovider.cpp
index f817e4016..f817e4016 100644
--- a/src/webengine/api/qquickwebenginefaviconprovider.cpp
+++ b/src/webenginequick/api/qquickwebenginefaviconprovider.cpp
diff --git a/src/webengine/api/qquickwebenginefaviconprovider_p_p.h b/src/webenginequick/api/qquickwebenginefaviconprovider_p_p.h
index 4ccc4ba10..80d2f65f2 100644
--- a/src/webengine/api/qquickwebenginefaviconprovider_p_p.h
+++ b/src/webenginequick/api/qquickwebenginefaviconprovider_p_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtWebEngine/private/qtwebengineglobal_p.h>
+#include <QtWebEngineQuick/private/qtwebengineglobal_p.h>
 #include <QtQuick/QQuickImageProvider>
 
 #include <QtCore/QMap>
diff --git a/src/webengine/api/qquickwebenginehistory.cpp b/src/webenginequick/api/qquickwebenginehistory.cpp
index 50feb067c..50feb067c 100644
--- a/src/webengine/api/qquickwebenginehistory.cpp
+++ b/src/webenginequick/api/qquickwebenginehistory.cpp
diff --git a/src/webengine/api/qquickwebenginehistory_p.h b/src/webenginequick/api/qquickwebenginehistory_p.h
index 89cef194f..828109230 100644
--- a/src/webengine/api/qquickwebenginehistory_p.h
+++ b/src/webenginequick/api/qquickwebenginehistory_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtWebEngine/qtwebengineglobal.h>
+#include <QtWebEngineQuick/qtwebengineglobal.h>
 #include <QAbstractListModel>
 #include <QtCore/qshareddata.h>
 #include <QQuickItem>
diff --git a/src/webengine/api/qquickwebenginehistory_p_p.h b/src/webenginequick/api/qquickwebenginehistory_p_p.h
index 019c6f0ad..019c6f0ad 100644
--- a/src/webengine/api/qquickwebenginehistory_p_p.h
+++ b/src/webenginequick/api/qquickwebenginehistory_p_p.h
diff --git a/src/webengine/api/qquickwebenginenavigationrequest.cpp b/src/webenginequick/api/qquickwebenginenavigationrequest.cpp
index 03c1d3d78..03c1d3d78 100644
--- a/src/webengine/api/qquickwebenginenavigationrequest.cpp
+++ b/src/webenginequick/api/qquickwebenginenavigationrequest.cpp
diff --git a/src/webengine/api/qquickwebenginenavigationrequest_p.h b/src/webenginequick/api/qquickwebenginenavigationrequest_p.h
index 55e3ca673..55e3ca673 100644
--- a/src/webengine/api/qquickwebenginenavigationrequest_p.h
+++ b/src/webenginequick/api/qquickwebenginenavigationrequest_p.h
diff --git a/src/webengine/api/qquickwebenginenewviewrequest.cpp b/src/webenginequick/api/qquickwebenginenewviewrequest.cpp
index 78ae1622a..78ae1622a 100644
--- a/src/webengine/api/qquickwebenginenewviewrequest.cpp
+++ b/src/webenginequick/api/qquickwebenginenewviewrequest.cpp
diff --git a/src/webengine/api/qquickwebenginenewviewrequest_p.h b/src/webenginequick/api/qquickwebenginenewviewrequest_p.h
index d4686b291..e1e0e5abd 100644
--- a/src/webengine/api/qquickwebenginenewviewrequest_p.h
+++ b/src/webenginequick/api/qquickwebenginenewviewrequest_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtWebEngine/private/qtwebengineglobal_p.h>
+#include <QtWebEngineQuick/private/qtwebengineglobal_p.h>
 #include "qquickwebengineview_p.h"
 
 namespace QtWebEngineCore {
diff --git a/src/webengine/api/qquickwebengineprofile.cpp b/src/webenginequick/api/qquickwebengineprofile.cpp
index 98ce9904e..98ce9904e 100644
--- a/src/webengine/api/qquickwebengineprofile.cpp
+++ b/src/webenginequick/api/qquickwebengineprofile.cpp
diff --git a/src/webengine/api/qquickwebengineprofile.h b/src/webenginequick/api/qquickwebengineprofile.h
index 088e6b225..c3f2f7958 100644
--- a/src/webengine/api/qquickwebengineprofile.h
+++ b/src/webenginequick/api/qquickwebengineprofile.h
@@ -40,7 +40,7 @@
 #ifndef QQUICKWEBENGINEPROFILE_H
 #define QQUICKWEBENGINEPROFILE_H
 
-#include <QtWebEngine/qtwebengineglobal.h>
+#include <QtWebEngineQuick/qtwebengineglobal.h>
 #include <QtCore/QObject>
 #include <QtCore/QScopedPointer>
 #include <QtCore/QString>
diff --git a/src/webengine/api/qquickwebengineprofile_p.h b/src/webenginequick/api/qquickwebengineprofile_p.h
index b9b52a693..b9b52a693 100644
--- a/src/webengine/api/qquickwebengineprofile_p.h
+++ b/src/webenginequick/api/qquickwebengineprofile_p.h
diff --git a/src/webengine/api/qquickwebenginescriptcollection.cpp b/src/webenginequick/api/qquickwebenginescriptcollection.cpp
index c0939d72f..c0939d72f 100644
--- a/src/webengine/api/qquickwebenginescriptcollection.cpp
+++ b/src/webenginequick/api/qquickwebenginescriptcollection.cpp
diff --git a/src/webengine/api/qquickwebenginescriptcollection.h b/src/webenginequick/api/qquickwebenginescriptcollection.h
index 8ae3dc02b..e125fee96 100644
--- a/src/webengine/api/qquickwebenginescriptcollection.h
+++ b/src/webenginequick/api/qquickwebenginescriptcollection.h
@@ -40,7 +40,7 @@
 #ifndef QQUICKWEBENGINESCRIPTCOLLECTION_H
 #define QQUICKWEBENGINESCRIPTCOLLECTION_H
 
-#include <QtWebEngine/qtwebengineglobal.h>
+#include <QtWebEngineQuick/qtwebengineglobal.h>
 #include <QtWebEngineCore/qwebenginescript.h>
 #include <QtCore/qscopedpointer.h>
 #include <QtCore/qlist.h>
diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webenginequick/api/qquickwebenginesettings.cpp
index 8728cc51a..f1fd00b8d 100644
--- a/src/webengine/api/qquickwebenginesettings.cpp
+++ b/src/webenginequick/api/qquickwebenginesettings.cpp
@@ -41,7 +41,7 @@
 
 #include "web_engine_settings.h"
 
-#include <QtWebEngine/QQuickWebEngineProfile>
+#include <QtWebEngineQuick/QQuickWebEngineProfile>
 #include <QtCore/QList>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/webengine/api/qquickwebenginesettings_p.h b/src/webenginequick/api/qquickwebenginesettings_p.h
index 5fd5ed960..8b275235a 100644
--- a/src/webengine/api/qquickwebenginesettings_p.h
+++ b/src/webenginequick/api/qquickwebenginesettings_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtWebEngine/private/qtwebengineglobal_p.h>
+#include <QtWebEngineQuick/private/qtwebengineglobal_p.h>
 #include <QObject>
 #include <QScopedPointer>
 
diff --git a/src/webengine/api/qquickwebenginesingleton.cpp b/src/webenginequick/api/qquickwebenginesingleton.cpp
index d49d92329..05f38e34e 100644
--- a/src/webengine/api/qquickwebenginesingleton.cpp
+++ b/src/webenginequick/api/qquickwebenginesingleton.cpp
@@ -40,7 +40,7 @@
 #include "qquickwebenginesingleton_p.h"
 
 #include "qquickwebenginesettings_p.h"
-#include <QtWebEngine/QQuickWebEngineProfile>
+#include <QtWebEngineQuick/QQuickWebEngineProfile>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/webengine/api/qquickwebenginesingleton_p.h b/src/webenginequick/api/qquickwebenginesingleton_p.h
index bca106314..cd7b5b2da 100644
--- a/src/webengine/api/qquickwebenginesingleton_p.h
+++ b/src/webenginequick/api/qquickwebenginesingleton_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtWebEngine/private/qtwebengineglobal_p.h>
+#include <QtWebEngineQuick/private/qtwebengineglobal_p.h>
 #include <QtWebEngineCore/qwebenginescript.h>
 #include <QtCore/qobject.h>
 
diff --git a/src/webengine/api/qquickwebenginetestsupport.cpp b/src/webenginequick/api/qquickwebenginetestsupport.cpp
index 06798fe99..06798fe99 100644
--- a/src/webengine/api/qquickwebenginetestsupport.cpp
+++ b/src/webenginequick/api/qquickwebenginetestsupport.cpp
diff --git a/src/webengine/api/qquickwebenginetestsupport_p.h b/src/webenginequick/api/qquickwebenginetestsupport_p.h
index 449994295..189643a87 100644
--- a/src/webengine/api/qquickwebenginetestsupport_p.h
+++ b/src/webenginequick/api/qquickwebenginetestsupport_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <QtGui/private/qinputmethod_p.h>
-#include <QtWebEngine/private/qtwebengineglobal_p.h>
+#include <QtWebEngineQuick/private/qtwebengineglobal_p.h>
 
 #include <QEvent>
 #include <QObject>
diff --git a/src/webengine/api/qquickwebenginetouchhandleprovider.cpp b/src/webenginequick/api/qquickwebenginetouchhandleprovider.cpp
index d6d6116dd..d6d6116dd 100644
--- a/src/webengine/api/qquickwebenginetouchhandleprovider.cpp
+++ b/src/webenginequick/api/qquickwebenginetouchhandleprovider.cpp
diff --git a/src/webengine/api/qquickwebenginetouchhandleprovider_p_p.h b/src/webenginequick/api/qquickwebenginetouchhandleprovider_p_p.h
index 5379a5729..8f5f8cc94 100644
--- a/src/webengine/api/qquickwebenginetouchhandleprovider_p_p.h
+++ b/src/webenginequick/api/qquickwebenginetouchhandleprovider_p_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <QtQuick/QQuickImageProvider>
-#include <QtWebEngine/private/qtwebengineglobal_p.h>
+#include <QtWebEngineQuick/private/qtwebengineglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webenginequick/api/qquickwebengineview.cpp
index 5d5392316..5456219fa 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webenginequick/api/qquickwebengineview.cpp
@@ -65,7 +65,7 @@
 #include "qwebenginescriptcollection.h"
 #include "qwebenginescriptcollection_p.h"
 #include "qwebengineregisterprotocolhandlerrequest.h"
-#if QT_CONFIG(webengine_testsupport)
+#if QT_CONFIG(webenginequick_testsupport)
 #include "qquickwebenginetestsupport_p.h"
 #endif
 
@@ -128,7 +128,7 @@ QQuickWebEngineViewPrivate::QQuickWebEngineViewPrivate()
     : m_profile(nullptr)
     , adapter(QSharedPointer<WebContentsAdapter>::create())
     , m_history(new QQuickWebEngineHistory(this))
-#if QT_CONFIG(webengine_testsupport)
+#if QT_CONFIG(webenginequick_testsupport)
     , m_testSupport(0)
 #endif
     , contextMenuExtraItems(0)
@@ -471,7 +471,7 @@ void QQuickWebEngineViewPrivate::loadStarted(const QUrl &provisionalUrl, bool is
 {
     Q_Q(QQuickWebEngineView);
     if (isErrorPage) {
-#if QT_CONFIG(webengine_testsupport)
+#if QT_CONFIG(webenginequick_testsupport)
         if (m_testSupport)
             m_testSupport->errorPage()->loadStarted(provisionalUrl);
 #endif
@@ -493,7 +493,7 @@ void QQuickWebEngineViewPrivate::loadCommitted()
 
 void QQuickWebEngineViewPrivate::didFirstVisuallyNonEmptyPaint()
 {
-#if QT_CONFIG(webengine_testsupport)
+#if QT_CONFIG(webenginequick_testsupport)
     if (m_loadVisuallyCommittedState == NotCommitted) {
         m_loadVisuallyCommittedState = DidFirstVisuallyNonEmptyPaint;
     } else if (m_loadVisuallyCommittedState == DidFirstCompositorFrameSwap) {
@@ -506,7 +506,7 @@ void QQuickWebEngineViewPrivate::didFirstVisuallyNonEmptyPaint()
 
 void QQuickWebEngineViewPrivate::didCompositorFrameSwap()
 {
-#if QT_CONFIG(webengine_testsupport)
+#if QT_CONFIG(webenginequick_testsupport)
     if (m_loadVisuallyCommittedState == NotCommitted) {
         m_loadVisuallyCommittedState = DidFirstCompositorFrameSwap;
     } else if (m_loadVisuallyCommittedState == DidFirstVisuallyNonEmptyPaint) {
@@ -524,7 +524,7 @@ void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, boo
     Q_UNUSED(triggersErrorPage);
 
     if (isErrorPage) {
-#if QT_CONFIG(webengine_testsupport)
+#if QT_CONFIG(webenginequick_testsupport)
         if (m_testSupport)
             m_testSupport->errorPage()->loadFinished(success, url);
 #endif
@@ -620,7 +620,7 @@ void QQuickWebEngineViewPrivate::close()
 
 void QQuickWebEngineViewPrivate::windowCloseRejected()
 {
-#if QT_CONFIG(webengine_testsupport)
+#if QT_CONFIG(webenginequick_testsupport)
     if (m_testSupport)
         Q_EMIT m_testSupport->windowCloseRejected();
 #endif
@@ -1220,7 +1220,7 @@ void QQuickWebEngineViewPrivate::updateAdapter()
     }
 }
 
-#if QT_CONFIG(webengine_testsupport)
+#if QT_CONFIG(webenginequick_testsupport)
 QQuickWebEngineTestSupport *QQuickWebEngineView::testSupport() const
 {
     Q_D(const QQuickWebEngineView);
diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webenginequick/api/qquickwebengineview_p.h
index 74be049f5..bb89d23bb 100644
--- a/src/webengine/api/qquickwebengineview_p.h
+++ b/src/webenginequick/api/qquickwebengineview_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <QtWebEngineCore/qtwebenginecoreglobal.h>
-#include <QtWebEngine/private/qtwebengineglobal_p.h>
+#include <QtWebEngineQuick/private/qtwebengineglobal_p.h>
 #include <QQuickItem>
 #include <QtGui/qcolor.h>
 
@@ -89,7 +89,7 @@ class QWebEngineRegisterProtocolHandlerRequest;
 class QWebEngineContextMenuRequest;
 class QQuickWebEngineScriptCollection;
 
-#if QT_CONFIG(webengine_testsupport)
+#if QT_CONFIG(webenginequick_testsupport)
 class QQuickWebEngineTestSupport;
 #endif
 
@@ -124,7 +124,7 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineView : public QQuickItem {
 
     Q_PROPERTY(QQuickWebEngineView *inspectedView READ inspectedView WRITE setInspectedView NOTIFY inspectedViewChanged REVISION 7 FINAL)
     Q_PROPERTY(QQuickWebEngineView *devToolsView READ devToolsView WRITE setDevToolsView NOTIFY devToolsViewChanged REVISION 7 FINAL)
-#if QT_CONFIG(webengine_testsupport)
+#if QT_CONFIG(webenginequick_testsupport)
     Q_PROPERTY(QQuickWebEngineTestSupport *testSupport READ testSupport WRITE setTestSupport NOTIFY testSupportChanged FINAL)
 #endif
 
@@ -486,7 +486,7 @@ public:
 
     qint64 renderProcessPid() const;
 
-#if QT_CONFIG(webengine_testsupport)
+#if QT_CONFIG(webenginequick_testsupport)
     QQuickWebEngineTestSupport *testSupport() const;
     void setTestSupport(QQuickWebEngineTestSupport *testSupport);
 #endif
@@ -571,7 +571,7 @@ Q_SIGNALS:
     Q_REVISION(10) void findTextFinished(const QWebEngineFindTextResult &result);
     Q_REVISION(11) void renderProcessPidChanged(qint64 pid);
 
-#if QT_CONFIG(webengine_testsupport)
+#if QT_CONFIG(webenginequick_testsupport)
     void testSupportChanged();
 #endif
 
diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webenginequick/api/qquickwebengineview_p_p.h
index d93ec3de6..d472d6975 100644
--- a/src/webengine/api/qquickwebengineview_p_p.h
+++ b/src/webenginequick/api/qquickwebengineview_p_p.h
@@ -83,7 +83,7 @@ class QQuickWebEngineProfilePrivate;
 class QQuickWebEngineTouchHandleProvider;
 class QWebEngineFindTextResult;
 
-#if QT_CONFIG(webengine_testsupport)
+#if QT_CONFIG(webenginequick_testsupport)
 class QQuickWebEngineTestSupport;
 #endif
 
@@ -190,7 +190,7 @@ public:
     QSharedPointer<QtWebEngineCore::WebContentsAdapter> adapter;
     QScopedPointer<QQuickWebEngineHistory> m_history;
     QScopedPointer<QQuickWebEngineSettings> m_settings;
-#if QT_CONFIG(webengine_testsupport)
+#if QT_CONFIG(webenginequick_testsupport)
     QQuickWebEngineTestSupport *m_testSupport;
 #endif
     QQmlComponent *contextMenuExtraItems;
diff --git a/src/webengine/api/qtwebengineglobal.cpp b/src/webenginequick/api/qtwebengineglobal.cpp
index 825805888..825805888 100644
--- a/src/webengine/api/qtwebengineglobal.cpp
+++ b/src/webenginequick/api/qtwebengineglobal.cpp
diff --git a/src/webengine/api/qtwebengineglobal.h b/src/webenginequick/api/qtwebengineglobal.h
index c2b33778a..50a91b745 100644
--- a/src/webengine/api/qtwebengineglobal.h
+++ b/src/webenginequick/api/qtwebengineglobal.h
@@ -41,7 +41,7 @@
 #define QTWEBENGINEGLOBAL_H
 
 #include <QtCore/qglobal.h>
-#include <QtWebEngine/qtwebengine-config.h>
+#include <QtWebEngineQuick/qtwebenginequick-config.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/webengine/api/qtwebengineglobal_p.h b/src/webenginequick/api/qtwebengineglobal_p.h
index 2d30f75b0..549de30d2 100644
--- a/src/webengine/api/qtwebengineglobal_p.h
+++ b/src/webenginequick/api/qtwebengineglobal_p.h
@@ -51,9 +51,9 @@
 // We mean it.
 //
 
-#include <QtWebEngine/qtwebengineglobal.h>
+#include <QtWebEngineQuick/qtwebengineglobal.h>
 #include <QtCore/private/qglobal_p.h>
-#include <QtWebEngine/private/qtwebengine-config_p.h>
+#include <QtWebEngineQuick/private/qtwebenginequick-config_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/webengine/configure.json b/src/webenginequick/configure.json
index ebe1ddb2b..6297195e9 100644
--- a/src/webengine/configure.json
+++ b/src/webenginequick/configure.json
@@ -1,26 +1,26 @@
 {
-    "module": "webengine",
-    "condition": "module.webenginecore && features.webengine-qml",
+    "module": "webenginequick",
+    "condition": "module.webenginecore && features.webengine-quick",
     "depends": [
         "webenginecore-private"
     ],
     "commandline": {
         "options": {
-            "webengine-qml": "boolean"
+            "webengine-quick": "boolean"
         }
     },
     "features": {
-        "webengine-qml": {
-            "label": "Support Qt WebEngine Qml",
-            "purpose": "Provides WebEngine Qml support.",
+        "webengine-quick": {
+            "label": "Support Qt WebEngineQuick",
+            "purpose": "Provides WebEngineQuick support.",
             "output": [ "privateFeature" ]
         },
-        "webengine-ui-delegates": {
+        "webenginequick-ui-delegates": {
             "label": "UI Delegates",
             "section": "WebEngine",
             "output": [ "privateFeature" ]
         },
-        "webengine-testsupport": {
+        "webenginequick-testsupport": {
             "label": "Test Support",
             "autoDetect": "features.private_tests || call.isTestsInBuildParts",
             "output": [ "privateFeature" ]
@@ -28,11 +28,11 @@
     },
     "summary": [
         {
-            "section": "Qt WebEngineQml",
+            "section": "Qt WebEngineQuick",
             "entries": [
-                "webengine-qml",
-                "webengine-ui-delegates",
-                "webengine-testsupport"
+                "webengine-quick",
+                "webenginequick-ui-delegates",
+                "webenginequick-testsupport"
             ]
         }
     ]
diff --git a/src/webengine/doc/QtWebEngineDoc b/src/webenginequick/doc/QtWebEngineDoc
index 0737885f1..0737885f1 100644
--- a/src/webengine/doc/QtWebEngineDoc
+++ b/src/webenginequick/doc/QtWebEngineDoc
diff --git a/src/webengine/doc/images/qtwebengine-architecture.png b/src/webenginequick/doc/images/qtwebengine-architecture.png
index 979a0ad3f..979a0ad3f 100644
--- a/src/webengine/doc/images/qtwebengine-architecture.png
+++ b/src/webenginequick/doc/images/qtwebengine-architecture.png
diff --git a/src/webengine/doc/images/qtwebengine-model.png b/src/webenginequick/doc/images/qtwebengine-model.png
index 0bbd556f1..0bbd556f1 100644
--- a/src/webengine/doc/images/qtwebengine-model.png
+++ b/src/webenginequick/doc/images/qtwebengine-model.png
diff --git a/src/webengine/doc/images/qtwebengine-model.qmodel b/src/webenginequick/doc/images/qtwebengine-model.qmodel
index f3d5cb52b..f3d5cb52b 100644
--- a/src/webengine/doc/images/qtwebengine-model.qmodel
+++ b/src/webenginequick/doc/images/qtwebengine-model.qmodel
diff --git a/src/webengine/doc/images/qtwebengine-modules-model.qmodel b/src/webenginequick/doc/images/qtwebengine-modules-model.qmodel
index c1d64b617..c1d64b617 100644
--- a/src/webengine/doc/images/qtwebengine-modules-model.qmodel
+++ b/src/webenginequick/doc/images/qtwebengine-modules-model.qmodel
diff --git a/src/webengine/doc/images/qtwebenginewidgets-model.png b/src/webenginequick/doc/images/qtwebenginewidgets-model.png
index c334b84c9..c334b84c9 100644
--- a/src/webengine/doc/images/qtwebenginewidgets-model.png
+++ b/src/webenginequick/doc/images/qtwebenginewidgets-model.png
diff --git a/src/webengine/doc/images/qtwebenginewidgets-model.qmodel b/src/webenginequick/doc/images/qtwebenginewidgets-model.qmodel
index aa59f7b8f..aa59f7b8f 100644
--- a/src/webengine/doc/images/qtwebenginewidgets-model.qmodel
+++ b/src/webenginequick/doc/images/qtwebenginewidgets-model.qmodel
diff --git a/src/webengine/doc/qtwebengine.qdocconf b/src/webenginequick/doc/qtwebengine.qdocconf
index be5db9c19..be5db9c19 100644
--- a/src/webengine/doc/qtwebengine.qdocconf
+++ b/src/webenginequick/doc/qtwebengine.qdocconf
diff --git a/src/webengine/doc/snippets/qtwebengine_build_snippet.qdoc b/src/webenginequick/doc/snippets/qtwebengine_build_snippet.qdoc
index 35bc480bb..35bc480bb 100644
--- a/src/webengine/doc/snippets/qtwebengine_build_snippet.qdoc
+++ b/src/webenginequick/doc/snippets/qtwebengine_build_snippet.qdoc
diff --git a/src/webengine/doc/snippets/qtwebengine_webengineview_newviewrequested.qml b/src/webenginequick/doc/snippets/qtwebengine_webengineview_newviewrequested.qml
index e7e6790f2..e7e6790f2 100644
--- a/src/webengine/doc/snippets/qtwebengine_webengineview_newviewrequested.qml
+++ b/src/webenginequick/doc/snippets/qtwebengine_webengineview_newviewrequested.qml
diff --git a/src/webengine/doc/src/context_menu_request.qdoc b/src/webenginequick/doc/src/context_menu_request.qdoc
index cc812dcf2..cc812dcf2 100644
--- a/src/webengine/doc/src/context_menu_request.qdoc
+++ b/src/webenginequick/doc/src/context_menu_request.qdoc
diff --git a/src/webengine/doc/src/external-resources.qdoc b/src/webenginequick/doc/src/external-resources.qdoc
index 7878ed9f8..7878ed9f8 100644
--- a/src/webengine/doc/src/external-resources.qdoc
+++ b/src/webenginequick/doc/src/external-resources.qdoc
diff --git a/src/webengine/doc/src/fullscreen_request.qdoc b/src/webenginequick/doc/src/fullscreen_request.qdoc
index ec7d93ba6..ec7d93ba6 100644
--- a/src/webengine/doc/src/fullscreen_request.qdoc
+++ b/src/webenginequick/doc/src/fullscreen_request.qdoc
diff --git a/src/webengine/doc/src/load_request.qdoc b/src/webenginequick/doc/src/load_request.qdoc
index abe3a403f..abe3a403f 100644
--- a/src/webengine/doc/src/load_request.qdoc
+++ b/src/webenginequick/doc/src/load_request.qdoc
diff --git a/src/webengine/doc/src/qtwebengine-debugging.qdoc b/src/webenginequick/doc/src/qtwebengine-debugging.qdoc
index 0db35c85c..0db35c85c 100644
--- a/src/webengine/doc/src/qtwebengine-debugging.qdoc
+++ b/src/webenginequick/doc/src/qtwebengine-debugging.qdoc
diff --git a/src/webengine/doc/src/qtwebengine-deploying.qdoc b/src/webenginequick/doc/src/qtwebengine-deploying.qdoc
index 7b9f3fd4a..7b9f3fd4a 100644
--- a/src/webengine/doc/src/qtwebengine-deploying.qdoc
+++ b/src/webenginequick/doc/src/qtwebengine-deploying.qdoc
diff --git a/src/webengine/doc/src/qtwebengine-examples.qdoc b/src/webenginequick/doc/src/qtwebengine-examples.qdoc
index d31895078..d31895078 100644
--- a/src/webengine/doc/src/qtwebengine-examples.qdoc
+++ b/src/webenginequick/doc/src/qtwebengine-examples.qdoc
diff --git a/src/webengine/doc/src/qtwebengine-features.qdoc b/src/webenginequick/doc/src/qtwebengine-features.qdoc
index 431367765..431367765 100644
--- a/src/webengine/doc/src/qtwebengine-features.qdoc
+++ b/src/webenginequick/doc/src/qtwebengine-features.qdoc
diff --git a/src/webengine/doc/src/qtwebengine-index.qdoc b/src/webenginequick/doc/src/qtwebengine-index.qdoc
index f668cf87b..f668cf87b 100644
--- a/src/webengine/doc/src/qtwebengine-index.qdoc
+++ b/src/webenginequick/doc/src/qtwebengine-index.qdoc
diff --git a/src/webengine/doc/src/qtwebengine-module.qdoc b/src/webenginequick/doc/src/qtwebengine-module.qdoc
index 5554bd519..5554bd519 100644
--- a/src/webengine/doc/src/qtwebengine-module.qdoc
+++ b/src/webenginequick/doc/src/qtwebengine-module.qdoc
diff --git a/src/webengine/doc/src/qtwebengine-modules.qdoc b/src/webenginequick/doc/src/qtwebengine-modules.qdoc
index 7b8ced728..7b8ced728 100644
--- a/src/webengine/doc/src/qtwebengine-modules.qdoc
+++ b/src/webenginequick/doc/src/qtwebengine-modules.qdoc
diff --git a/src/webengine/doc/src/qtwebengine-overview.qdoc b/src/webenginequick/doc/src/qtwebengine-overview.qdoc
index 9908d46a8..9908d46a8 100644
--- a/src/webengine/doc/src/qtwebengine-overview.qdoc
+++ b/src/webenginequick/doc/src/qtwebengine-overview.qdoc
diff --git a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc b/src/webenginequick/doc/src/qtwebengine-platform-notes.qdoc
index 6356b97af..6356b97af 100644
--- a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc
+++ b/src/webenginequick/doc/src/qtwebengine-platform-notes.qdoc
diff --git a/src/webengine/doc/src/qtwebengine-qmlmodule.qdoc b/src/webenginequick/doc/src/qtwebengine-qmlmodule.qdoc
index 4fd7e3a3b..4fd7e3a3b 100644
--- a/src/webengine/doc/src/qtwebengine-qmlmodule.qdoc
+++ b/src/webenginequick/doc/src/qtwebengine-qmlmodule.qdoc
diff --git a/src/webengine/doc/src/quota_request.qdoc b/src/webenginequick/doc/src/quota_request.qdoc
index ee64c0484..ee64c0484 100644
--- a/src/webengine/doc/src/quota_request.qdoc
+++ b/src/webenginequick/doc/src/quota_request.qdoc
diff --git a/src/webengine/doc/src/qwebengine-licensing.qdoc b/src/webenginequick/doc/src/qwebengine-licensing.qdoc
index f6a0a6c32..f6a0a6c32 100644
--- a/src/webengine/doc/src/qwebengine-licensing.qdoc
+++ b/src/webenginequick/doc/src/qwebengine-licensing.qdoc
diff --git a/src/webengine/doc/src/register_protocol_handler_request.qdoc b/src/webenginequick/doc/src/register_protocol_handler_request.qdoc
index b3ebcb31b..b3ebcb31b 100644
--- a/src/webengine/doc/src/register_protocol_handler_request.qdoc
+++ b/src/webenginequick/doc/src/register_protocol_handler_request.qdoc
diff --git a/src/webengine/doc/src/webengine_certificate_error.qdoc b/src/webenginequick/doc/src/webengine_certificate_error.qdoc
index 8c032dc8b..8c032dc8b 100644
--- a/src/webengine/doc/src/webengine_certificate_error.qdoc
+++ b/src/webenginequick/doc/src/webengine_certificate_error.qdoc
diff --git a/src/webengine/doc/src/webengine_download_request.qdoc b/src/webenginequick/doc/src/webengine_download_request.qdoc
index 2b96ec45b..2b96ec45b 100644
--- a/src/webengine/doc/src/webengine_download_request.qdoc
+++ b/src/webenginequick/doc/src/webengine_download_request.qdoc
diff --git a/src/webengine/doc/src/webengineview_lgpl.qdoc b/src/webenginequick/doc/src/webengineview_lgpl.qdoc
index 2be475903..2be475903 100644
--- a/src/webengine/doc/src/webengineview_lgpl.qdoc
+++ b/src/webenginequick/doc/src/webengineview_lgpl.qdoc
diff --git a/src/webengine/module.pro b/src/webenginequick/module.pro
index a9cc50f65..7b494bb5b 100644
--- a/src/webengine/module.pro
+++ b/src/webenginequick/module.pro
@@ -1,8 +1,8 @@
-include($$QTWEBENGINE_OUT_ROOT/src/webengine/qtwebengine-config.pri)
-QT_FOR_CONFIG += webengine-private webenginecore-private
+include($$QTWEBENGINE_OUT_ROOT/src/webenginequick/qtwebenginequick-config.pri)
+QT_FOR_CONFIG += webenginequick-private webenginecore-private
 
-TARGET = QtWebEngine
-MODULE = webengine
+TARGET = QtWebEngineQuick
+MODULE = webenginequick
 
 # For our export macros
 DEFINES += QT_BUILD_WEBENGINE_LIB
@@ -56,7 +56,7 @@ HEADERS = \
         render_widget_host_view_qt_delegate_quickwindow.h \
         ui_delegates_manager.h
 
-qtConfig(webengine-testsupport) {
+qtConfig(webenginequick-testsupport) {
     QT_PRIVATE += testlib
     SOURCES += api/qquickwebenginetestsupport.cpp
     HEADERS += api/qquickwebenginetestsupport_p.h
diff --git a/src/webengine/plugin/dependencies.json b/src/webenginequick/plugin/dependencies.json
index ef26b3617..ef26b3617 100644
--- a/src/webengine/plugin/dependencies.json
+++ b/src/webenginequick/plugin/dependencies.json
diff --git a/src/webengine/plugin/plugin.cpp b/src/webenginequick/plugin/plugin.cpp
index e53ce3cea..ead71694b 100644
--- a/src/webengine/plugin/plugin.cpp
+++ b/src/webenginequick/plugin/plugin.cpp
@@ -38,19 +38,19 @@
 ****************************************************************************/
 
 #include <QtQml/qqmlextensionplugin.h>
-#include <QtWebEngine/QQuickWebEngineProfile>
+#include <QtWebEngineQuick/QQuickWebEngineProfile>
 
-#include <QtWebEngine/private/qquickwebengineclientcertificateselection_p.h>
-#include <QtWebEngine/private/qquickwebenginedialogrequests_p.h>
-#include <QtWebEngine/private/qquickwebenginehistory_p.h>
-#include <QtWebEngine/private/qquickwebenginefaviconprovider_p_p.h>
-#include <QtWebEngine/private/qquickwebenginenavigationrequest_p.h>
-#include <QtWebEngine/private/qquickwebenginenewviewrequest_p.h>
-#include <QtWebEngine/private/qquickwebenginesettings_p.h>
-#include <QtWebEngine/private/qquickwebenginesingleton_p.h>
-#include <QtWebEngine/private/qquickwebenginetouchhandleprovider_p_p.h>
-#include <QtWebEngine/private/qquickwebengineview_p.h>
-#include <QtWebEngine/private/qquickwebengineaction_p.h>
+#include <QtWebEngineQuick/private/qquickwebengineclientcertificateselection_p.h>
+#include <QtWebEngineQuick/private/qquickwebenginedialogrequests_p.h>
+#include <QtWebEngineQuick/private/qquickwebenginehistory_p.h>
+#include <QtWebEngineQuick/private/qquickwebenginefaviconprovider_p_p.h>
+#include <QtWebEngineQuick/private/qquickwebenginenavigationrequest_p.h>
+#include <QtWebEngineQuick/private/qquickwebenginenewviewrequest_p.h>
+#include <QtWebEngineQuick/private/qquickwebenginesettings_p.h>
+#include <QtWebEngineQuick/private/qquickwebenginesingleton_p.h>
+#include <QtWebEngineQuick/private/qquickwebenginetouchhandleprovider_p_p.h>
+#include <QtWebEngineQuick/private/qquickwebengineview_p.h>
+#include <QtWebEngineQuick/private/qquickwebengineaction_p.h>
 #include <QtWebEngineCore/qwebenginecertificateerror.h>
 #include <QtWebEngineCore/qwebenginefindtextresult.h>
 #include <QtWebEngineCore/qwebenginefullscreenrequest.h>
diff --git a/src/webengine/plugin/plugin.pro b/src/webenginequick/plugin/plugin.pro
index 3b30bece2..236f199a2 100644
--- a/src/webengine/plugin/plugin.pro
+++ b/src/webenginequick/plugin/plugin.pro
@@ -4,7 +4,7 @@ TARGETPATH = QtWebEngine
 IMPORT_VERSION = 1.10
 
 QT += qml quick
-QT_PRIVATE += core-private webenginecore-private webengine-private
+QT_PRIVATE += core-private webenginecore-private webenginequick-private
 
 SOURCES = plugin.cpp
 
diff --git a/src/webengine/plugin/plugins.qmltypes b/src/webenginequick/plugin/plugins.qmltypes
index 6c96e2678..6c96e2678 100644
--- a/src/webengine/plugin/plugins.qmltypes
+++ b/src/webenginequick/plugin/plugins.qmltypes
diff --git a/src/webengine/plugin/qmldir b/src/webenginequick/plugin/qmldir
index 8970dc9c1..8970dc9c1 100644
--- a/src/webengine/plugin/qmldir
+++ b/src/webenginequick/plugin/qmldir
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp b/src/webenginequick/render_widget_host_view_qt_delegate_quick.cpp
index 1c42c206d..38d787bd4 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
+++ b/src/webenginequick/render_widget_host_view_qt_delegate_quick.cpp
@@ -358,7 +358,7 @@ QSGNode *RenderWidgetHostViewQtDelegateQuick::updatePaintNode(QSGNode *oldNode,
         Q_UNREACHABLE();
     }
 
-#if QT_CONFIG(webengine_testsupport)
+#if QT_CONFIG(webenginequick_testsupport)
     if (m_view)
         QMetaObject::invokeMethod(
                 m_view, [view = m_view]() { view->d_ptr->didCompositorFrameSwap(); },
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.h b/src/webenginequick/render_widget_host_view_qt_delegate_quick.h
index 015b9cdf4..015b9cdf4 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quick.h
+++ b/src/webenginequick/render_widget_host_view_qt_delegate_quick.h
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quickwindow.cpp b/src/webenginequick/render_widget_host_view_qt_delegate_quickwindow.cpp
index c6d866033..c6d866033 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quickwindow.cpp
+++ b/src/webenginequick/render_widget_host_view_qt_delegate_quickwindow.cpp
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quickwindow.h b/src/webenginequick/render_widget_host_view_qt_delegate_quickwindow.h
index 632c59fa5..632c59fa5 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quickwindow.h
+++ b/src/webenginequick/render_widget_host_view_qt_delegate_quickwindow.h
diff --git a/src/webengine/testsupport/plugin.cpp b/src/webenginequick/testsupport/plugin.cpp
index 828110207..087cd2919 100644
--- a/src/webengine/testsupport/plugin.cpp
+++ b/src/webenginequick/testsupport/plugin.cpp
@@ -39,7 +39,7 @@
 
 #include <QtQml>
 
-#include <QtWebEngine/private/qquickwebenginetestsupport_p.h>
+#include <QtWebEngineQuick/private/qquickwebenginetestsupport_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/webengine/testsupport/plugins.qmltypes b/src/webenginequick/testsupport/plugins.qmltypes
index d371e1af6..d371e1af6 100644
--- a/src/webengine/testsupport/plugins.qmltypes
+++ b/src/webenginequick/testsupport/plugins.qmltypes
diff --git a/src/webengine/testsupport/qmldir b/src/webenginequick/testsupport/qmldir
index 7fff80251..7fff80251 100644
--- a/src/webengine/testsupport/qmldir
+++ b/src/webenginequick/testsupport/qmldir
diff --git a/src/webengine/testsupport/testsupport.pro b/src/webenginequick/testsupport/testsupport.pro
index a24796675..891bcb618 100644
--- a/src/webengine/testsupport/testsupport.pro
+++ b/src/webenginequick/testsupport/testsupport.pro
@@ -4,7 +4,7 @@ TARGETPATH = QtWebEngine/testsupport
 IMPORT_VERSION = 1.0
 
 QT += qml quick
-QT_PRIVATE += webengine-private gui-private
+QT_PRIVATE += webenginequick-private gui-private
 
 SOURCES = plugin.cpp
 
diff --git a/src/webengine/ui/AlertDialog.qml b/src/webenginequick/ui/AlertDialog.qml
index 07f2d7df5..07f2d7df5 100644
--- a/src/webengine/ui/AlertDialog.qml
+++ b/src/webenginequick/ui/AlertDialog.qml
diff --git a/src/webengine/ui/AuthenticationDialog.qml b/src/webenginequick/ui/AuthenticationDialog.qml
index a7eedd14d..a7eedd14d 100644
--- a/src/webengine/ui/AuthenticationDialog.qml
+++ b/src/webenginequick/ui/AuthenticationDialog.qml
diff --git a/src/webengine/ui/ColorDialog.qml b/src/webenginequick/ui/ColorDialog.qml
index b74fd2cd7..b74fd2cd7 100644
--- a/src/webengine/ui/ColorDialog.qml
+++ b/src/webenginequick/ui/ColorDialog.qml
diff --git a/src/webengine/ui/ConfirmDialog.qml b/src/webenginequick/ui/ConfirmDialog.qml
index aab4db04a..aab4db04a 100644
--- a/src/webengine/ui/ConfirmDialog.qml
+++ b/src/webenginequick/ui/ConfirmDialog.qml
diff --git a/src/webengine/ui/FilePicker.qml b/src/webenginequick/ui/FilePicker.qml
index e6af977ba..e6af977ba 100644
--- a/src/webengine/ui/FilePicker.qml
+++ b/src/webenginequick/ui/FilePicker.qml
diff --git a/src/webengine/ui/Menu.qml b/src/webenginequick/ui/Menu.qml
index 36efa7680..36efa7680 100644
--- a/src/webengine/ui/Menu.qml
+++ b/src/webenginequick/ui/Menu.qml
diff --git a/src/webengine/ui/MenuItem.qml b/src/webenginequick/ui/MenuItem.qml
index e61f4c230..e61f4c230 100644
--- a/src/webengine/ui/MenuItem.qml
+++ b/src/webenginequick/ui/MenuItem.qml
diff --git a/src/webengine/ui/MenuSeparator.qml b/src/webenginequick/ui/MenuSeparator.qml
index 8427865cb..8427865cb 100644
--- a/src/webengine/ui/MenuSeparator.qml
+++ b/src/webenginequick/ui/MenuSeparator.qml
diff --git a/src/webengine/ui/PromptDialog.qml b/src/webenginequick/ui/PromptDialog.qml
index c4dcd6b98..c4dcd6b98 100644
--- a/src/webengine/ui/PromptDialog.qml
+++ b/src/webenginequick/ui/PromptDialog.qml
diff --git a/src/webengine/ui/ToolTip.qml b/src/webenginequick/ui/ToolTip.qml
index 2bfe9eaf5..2bfe9eaf5 100644
--- a/src/webengine/ui/ToolTip.qml
+++ b/src/webenginequick/ui/ToolTip.qml
diff --git a/src/webengine/ui/TouchHandle.qml b/src/webenginequick/ui/TouchHandle.qml
index 76a93829e..76a93829e 100644
--- a/src/webengine/ui/TouchHandle.qml
+++ b/src/webenginequick/ui/TouchHandle.qml
diff --git a/src/webengine/ui/TouchSelectionMenu.qml b/src/webenginequick/ui/TouchSelectionMenu.qml
index 7cf16b554..7cf16b554 100644
--- a/src/webengine/ui/TouchSelectionMenu.qml
+++ b/src/webenginequick/ui/TouchSelectionMenu.qml
diff --git a/src/webengine/ui/qmldir b/src/webenginequick/ui/qmldir
index e23b972be..e23b972be 100644
--- a/src/webengine/ui/qmldir
+++ b/src/webenginequick/ui/qmldir
diff --git a/src/webengine/ui/ui.pro b/src/webenginequick/ui/ui.pro
index 69f754e0c..69f754e0c 100644
--- a/src/webengine/ui/ui.pro
+++ b/src/webenginequick/ui/ui.pro
diff --git a/src/webengine/ui2/AlertDialog.qml b/src/webenginequick/ui2/AlertDialog.qml
index 4f63c5b70..4f63c5b70 100644
--- a/src/webengine/ui2/AlertDialog.qml
+++ b/src/webenginequick/ui2/AlertDialog.qml
diff --git a/src/webengine/ui2/AuthenticationDialog.qml b/src/webenginequick/ui2/AuthenticationDialog.qml
index 52fcce3f1..52fcce3f1 100644
--- a/src/webengine/ui2/AuthenticationDialog.qml
+++ b/src/webenginequick/ui2/AuthenticationDialog.qml
diff --git a/src/webengine/ui2/ConfirmDialog.qml b/src/webenginequick/ui2/ConfirmDialog.qml
index 0649d3654..0649d3654 100644
--- a/src/webengine/ui2/ConfirmDialog.qml
+++ b/src/webenginequick/ui2/ConfirmDialog.qml
diff --git a/src/webengine/ui2/Menu.qml b/src/webenginequick/ui2/Menu.qml
index 0e7b869f5..0e7b869f5 100644
--- a/src/webengine/ui2/Menu.qml
+++ b/src/webenginequick/ui2/Menu.qml
diff --git a/src/webengine/ui2/MenuItem.qml b/src/webenginequick/ui2/MenuItem.qml
index 9bf8aac5e..9bf8aac5e 100644
--- a/src/webengine/ui2/MenuItem.qml
+++ b/src/webenginequick/ui2/MenuItem.qml
diff --git a/src/webengine/ui2/MenuSeparator.qml b/src/webenginequick/ui2/MenuSeparator.qml
index 0c664084a..0c664084a 100644
--- a/src/webengine/ui2/MenuSeparator.qml
+++ b/src/webenginequick/ui2/MenuSeparator.qml
diff --git a/src/webengine/ui2/PromptDialog.qml b/src/webenginequick/ui2/PromptDialog.qml
index 880213e36..880213e36 100644
--- a/src/webengine/ui2/PromptDialog.qml
+++ b/src/webenginequick/ui2/PromptDialog.qml
diff --git a/src/webengine/ui2/ToolTip.qml b/src/webenginequick/ui2/ToolTip.qml
index 91645a0f4..91645a0f4 100644
--- a/src/webengine/ui2/ToolTip.qml
+++ b/src/webenginequick/ui2/ToolTip.qml
diff --git a/src/webengine/ui2/information.png b/src/webenginequick/ui2/information.png
index 0a2eb87d1..0a2eb87d1 100644
--- a/src/webengine/ui2/information.png
+++ b/src/webenginequick/ui2/information.png
diff --git a/src/webengine/ui2/qmldir b/src/webenginequick/ui2/qmldir
index 8ab0d3671..8ab0d3671 100644
--- a/src/webengine/ui2/qmldir
+++ b/src/webenginequick/ui2/qmldir
diff --git a/src/webengine/ui2/question.png b/src/webenginequick/ui2/question.png
index 2dd92fd79..2dd92fd79 100644
--- a/src/webengine/ui2/question.png
+++ b/src/webenginequick/ui2/question.png
diff --git a/src/webengine/ui2/ui2.pro b/src/webenginequick/ui2/ui2.pro
index 4628d40b5..4628d40b5 100644
--- a/src/webengine/ui2/ui2.pro
+++ b/src/webenginequick/ui2/ui2.pro
diff --git a/src/webengine/ui_delegates_manager.cpp b/src/webenginequick/ui_delegates_manager.cpp
index 756b3429e..756b3429e 100644
--- a/src/webengine/ui_delegates_manager.cpp
+++ b/src/webenginequick/ui_delegates_manager.cpp
diff --git a/src/webengine/ui_delegates_manager.h b/src/webenginequick/ui_delegates_manager.h
index 4b6e291b2..4b6e291b2 100644
--- a/src/webengine/ui_delegates_manager.h
+++ b/src/webenginequick/ui_delegates_manager.h
diff --git a/src/webengine/webengine.pro b/src/webenginequick/webenginequick.pro
index 23668229e..fe27ee089 100644
--- a/src/webengine/webengine.pro
+++ b/src/webenginequick/webenginequick.pro
@@ -7,13 +7,13 @@ qml_plugin.depends = qml_module
 
 SUBDIRS += qml_module qml_plugin
 
-qtConfig(webengine-testsupport) {
+qtConfig(webenginequick-testsupport) {
     testsupport_plugin.file = testsupport/testsupport.pro
     testsupport_plugin.depends = qml_module
     SUBDIRS += testsupport_plugin
 }
 
-qtConfig(webengine-ui-delegates) {
+qtConfig(webenginequick-ui-delegates) {
     SUBDIRS += ui \
                ui2
 }
diff --git a/sync.profile b/sync.profile
index a1e3c8ded..b68bcd4bb 100644
--- a/sync.profile
+++ b/sync.profile
@@ -1,12 +1,12 @@
 %modules = ( # path to module name map
-    "QtWebEngine" => "$basedir/src/webengine",
+    "QtWebEngineQuick" => "$basedir/src/webenginequick",
     "QtWebEngineWidgets" => "$basedir/src/webenginewidgets",
     "QtWebEngineCore" => "$basedir/src/core",
     "QtPdf" => "$basedir/src/pdf",
     "QtPdfWidgets" => "$basedir/src/pdfwidgets",
 );
 %moduleheaders = ( # restrict the module headers to those found in relative path
-    "QtWebEngine" => "api",
+    "QtWebEngineQuick" => "api",
     "QtWebEngineWidgets" => "api",
     "QtWebEngineCore" => "api",
     "QtPdf" => "api"
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
 }