Fix QWebEngineQuick namespace for webenginequick module

This is followup change for QtWebEngineQuick rename.

[ChangeLog][QtWebEngineQuick] Use namespace QtWebEngineQuick
QtWebEngine::initialize() is now QtWebEnigneQuick::initialize()

Change-Id: I90acab04ff0240b399a863c88eff915efa360f6f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 5f723fe7469ac9ce3373dbcd3eb0978595271514)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

42 files changed, 73 insertions, 72 deletions

diff --git a/examples/webengine/customdialogs/main.cpp b/examples/webengine/customdialogs/main.cpp
index e3c4ad085..463da44f6 100644
--- a/examples/webengine/customdialogs/main.cpp
+++ b/examples/webengine/customdialogs/main.cpp
@@ -49,7 +49,7 @@
 ****************************************************************************/
 
 #include "server.h"
-#include <qtwebengineglobal.h>
+#include <QtWebEngineQuick/qtwebenginequickglobal.h>
 #include <QNetworkProxy>
 #include <QQmlApplicationEngine>
 #include <QTimer>
@@ -66,7 +66,7 @@ typedef QGuiApplication Application;
 int main(int argc, char *argv[])
 {
     QCoreApplication::setOrganizationName("QtExamples");
-    QtWebEngine::initialize();
+    QtWebEngineQuick::initialize();
 
     Application app(argc, argv);
 
diff --git a/examples/webengine/lifecycle/main.cpp b/examples/webengine/lifecycle/main.cpp
index 3972639c5..44deacc46 100644
--- a/examples/webengine/lifecycle/main.cpp
+++ b/examples/webengine/lifecycle/main.cpp
@@ -52,12 +52,12 @@
 #include <QQmlApplicationEngine>
 #include <QQmlContext>
 #include <QQuickStyle>
-#include <qtwebengineglobal.h>
+#include <QtWebEngineQuick/qtwebenginequickglobal.h>
 
 int main(int argc, char *argv[])
 {
     QCoreApplication::setOrganizationName("QtExamples");
-    QtWebEngine::initialize();
+    QtWebEngineQuick::initialize();
     QGuiApplication app(argc, argv);
     QQmlApplicationEngine engine;
     engine.load(QUrl(QStringLiteral("qrc:/WebBrowser.qml")));
diff --git a/examples/webengine/minimal/doc/src/minimal.qdoc b/examples/webengine/minimal/doc/src/minimal.qdoc
index 1e629f689..f63d15c8a 100644
--- a/examples/webengine/minimal/doc/src/minimal.qdoc
+++ b/examples/webengine/minimal/doc/src/minimal.qdoc
@@ -44,7 +44,7 @@
 
     In \c main.cpp we use only the QGuiApplication and QQmlApplicationEngine
     classes. We also include \c qtwebengineglobal.h to be able to use
-    \l{QtWebEngine::initialize}.
+    \l{QtWebEngineQuick::initialize}.
 
     \quotefromfile webengine/minimal/main.cpp
     \skipto #include
@@ -56,7 +56,7 @@
     \l{WebEngineProfile::cachePath} and
     \l{WebEngineProfile::persistentStoragePath}).
 
-    Next, we call \l{QtWebEngine::initialize}, which makes sure that OpenGL
+    Next, we call \l{QtWebEngineQuick::initialize}, which makes sure that OpenGL
     contexts can be shared between the main process and the dedicated renderer
     process (\c QtWebEngineProcess). This method needs to be called before
     any OpenGL context is created.
diff --git a/examples/webengine/minimal/main.cpp b/examples/webengine/minimal/main.cpp
index fde716451..cf11eea26 100644
--- a/examples/webengine/minimal/main.cpp
+++ b/examples/webengine/minimal/main.cpp
@@ -50,13 +50,13 @@
 
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
-#include <qtwebengineglobal.h>
+#include <QtWebEngineQuick/qtwebenginequickglobal.h>
 
 int main(int argc, char *argv[])
 {
     QCoreApplication::setOrganizationName("QtExamples");
     QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
-    QtWebEngine::initialize();
+    QtWebEngineQuick::initialize();
     QGuiApplication app(argc, argv);
 
     QQmlApplicationEngine engine;
diff --git a/examples/webengine/quicknanobrowser/main.cpp b/examples/webengine/quicknanobrowser/main.cpp
index 4c4c80390..859856d92 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 <QtWebEngineQuick/qtwebengineglobal.h>
+#include <QtWebEngineQuick/qtwebenginequickglobal.h>
 
 static QUrl startupUrl()
 {
@@ -79,7 +79,7 @@ static QUrl startupUrl()
 int main(int argc, char **argv)
 {
     QCoreApplication::setOrganizationName("QtExamples");
-    QtWebEngine::initialize();
+    QtWebEngineQuick::initialize();
 
     Application app(argc, argv);
 
diff --git a/examples/webengine/recipebrowser/doc/src/recipebrowser.qdoc b/examples/webengine/recipebrowser/doc/src/recipebrowser.qdoc
index 6e1ed84e3..e777c612a 100644
--- a/examples/webengine/recipebrowser/doc/src/recipebrowser.qdoc
+++ b/examples/webengine/recipebrowser/doc/src/recipebrowser.qdoc
@@ -46,7 +46,7 @@
     \section1 C++ Code
 
     In \c main.cpp, we use the \l{QGuiApplication} and \l{QQmlApplicationEngine}
-    classes to set up and load the main QML file. We call \l{QtWebEngine::initialize} so we can use
+    classes to set up and load the main QML file. We call \l{QtWebEngineQuick::initialize} so we can use
     \l{WebEngineView} in our QML code. We set the default Qt Quick Controls 2 style
     to the Material style, so we do not have to specify it for each new item we add. Finally, we use
     a C++ define to check whether the application is compiled for an embedded platform.
diff --git a/examples/webengine/recipebrowser/main.cpp b/examples/webengine/recipebrowser/main.cpp
index b5e5224ed..5e9281ce5 100644
--- a/examples/webengine/recipebrowser/main.cpp
+++ b/examples/webengine/recipebrowser/main.cpp
@@ -52,12 +52,12 @@
 #include <QQmlApplicationEngine>
 #include <QQmlContext>
 #include <QQuickStyle>
-#include <qtwebengineglobal.h>
+#include <QtWebEngineQuick/qtwebenginequickglobal.h>
 
 int main(int argc, char *argv[])
 {
     QCoreApplication::setOrganizationName("QtExamples");
-    QtWebEngine::initialize();
+    QtWebEngineQuick::initialize();
 
     QGuiApplication app(argc, argv);
 
diff --git a/examples/webengine/webengineaction/main.cpp b/examples/webengine/webengineaction/main.cpp
index b0ef0848a..a30749ebe 100644
--- a/examples/webengine/webengineaction/main.cpp
+++ b/examples/webengine/webengineaction/main.cpp
@@ -50,12 +50,12 @@
 
 #include <QGuiApplication>
 #include <QQmlApplicationEngine>
-#include <qtwebengineglobal.h>
+#include <QtWebEngineQuick/qtwebenginequickglobal.h>
 
 int main(int argc, char *argv[])
 {
     QCoreApplication::setOrganizationName("QtExamples");
-    QtWebEngine::initialize();
+    QtWebEngineQuick::initialize();
 
     QGuiApplication app(argc, argv);
 
diff --git a/src/core/api/qtwebenginecoreglobal.cpp b/src/core/api/qtwebenginecoreglobal.cpp
index 182926889..d9b631313 100644
--- a/src/core/api/qtwebenginecoreglobal.cpp
+++ b/src/core/api/qtwebenginecoreglobal.cpp
@@ -91,7 +91,7 @@ static void deleteShareContext()
 
 #endif
 // ### Qt 6: unify this logic and Qt::AA_ShareOpenGLContexts.
-// QtWebEngine::initialize was introduced first and meant to be called
+// QtWebEngineQuick::initialize was introduced first and meant to be called
 // after the QGuiApplication creation, when AA_ShareOpenGLContexts fills
 // the same need but the flag has to be set earlier.
 
@@ -110,7 +110,7 @@ Q_WEBENGINECORE_PRIVATE_EXPORT void initialize()
 
         QCoreApplication *app = QCoreApplication::instance();
         if (!app) {
-            qFatal("QtWebEngine::initialize() but no core application instance.");
+            qFatal("QtWebEngineQuick::initialize() but no core application instance.");
             return;
         }
 
@@ -119,7 +119,7 @@ Q_WEBENGINECORE_PRIVATE_EXPORT void initialize()
             return;
 
         if (app->thread() != QThread::currentThread()) {
-            qFatal("QtWebEngine::initialize() must be called from the Qt gui thread.");
+            qFatal("QtWebEngineQuick::initialize() must be called from the Qt gui thread.");
             return;
         }
 
@@ -225,7 +225,7 @@ static void initialize()
 {
 #if QT_CONFIG(opengl)
   if (QCoreApplication::instance()) {
-    // On window/ANGLE, calling QtWebEngine::initialize from DllMain will result in a crash.
+    // On window/ANGLE, calling QtWebEngineQuick::initialize from DllMain will result in a crash.
     if (!qt_gl_global_share_context()) {
       qWarning("Qt WebEngine seems to be initialized from a plugin. Please "
                "set Qt::AA_ShareOpenGLContexts using QCoreApplication::setAttribute and "
diff --git a/src/core/api/qwebenginenewwindowrequest.h b/src/core/api/qwebenginenewwindowrequest.h
index b419a0202..5af850ebe 100644
--- a/src/core/api/qwebenginenewwindowrequest.h
+++ b/src/core/api/qwebenginenewwindowrequest.h
@@ -40,7 +40,7 @@
 #ifndef QWEBENGINENEWWINDOWREQUEST_P_H
 #define QWEBENGINENEWWINDOWREQUEST_P_H
 
-#include <qtwebenginecoreglobal.h>
+#include <QtWebEngineCore/qtwebenginecoreglobal.h>
 #include <QtCore/QObject>
 #include <QtCore/QRect>
 #include <QtCore/QScopedPointer>
diff --git a/src/core/ozone/gl_context_qt.cpp b/src/core/ozone/gl_context_qt.cpp
index 1b1cef485..554977516 100644
--- a/src/core/ozone/gl_context_qt.cpp
+++ b/src/core/ozone/gl_context_qt.cpp
@@ -62,7 +62,7 @@ inline void *resourceForContext(const QByteArray &resource)
 #if QT_CONFIG(opengl)
     QOpenGLContext *shareContext = qt_gl_global_share_context();
     if (!shareContext) {
-        qFatal("QWebEngine: OpenGL resource sharing is not set up in QtQuick. Please make sure to call QtWebEngine::initialize() in your main() function.");
+        qFatal("QWebEngine: OpenGL resource sharing is not set up in QtQuick. Please make sure to call QtWebEngineCore::initialize() in your main() function.");
     }
     return qApp->platformNativeInterface()->nativeResourceForContext(resource, shareContext);
 #else
diff --git a/src/core/ozone/gl_share_context_qt.cpp b/src/core/ozone/gl_share_context_qt.cpp
index f6b9aa63f..4865734f7 100644
--- a/src/core/ozone/gl_share_context_qt.cpp
+++ b/src/core/ozone/gl_share_context_qt.cpp
@@ -100,7 +100,7 @@ void ShareGroupQt::AboutToAddFirstContext()
     QOpenGLContext *shareContext = QOpenGLContext::globalShareContext();
     if (!shareContext) {
         qFatal("QWebEngine: OpenGL resource sharing is not set up in QtQuick. Please make sure to "
-               "call QtWebEngine::initialize() in your main() function before QCoreApplication is "
+               "call QtWebEngineCore::initialize() in your main() function before QCoreApplication is "
                "created.");
     }
     m_shareContextQt = new QtShareGLContext(shareContext);
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index ed2a240d6..4479264cc 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -212,7 +212,7 @@ static const char *getGLType(bool enableGLSoftwareRendering)
             || enableGLSoftwareRendering;
     if (tryGL) {
         if (!qt_gl_global_share_context() || !qt_gl_global_share_context()->isValid()) {
-            qWarning("WebEngineContext used before QtWebEngine::initialize() or OpenGL context "
+            qWarning("WebEngineContext used before QtWebEngineCore::initialize() or OpenGL context "
                      "creation failed.");
         } else {
             const QSurfaceFormat sharedFormat = qt_gl_global_share_context()->format();
diff --git a/src/webenginequick/CMakeLists.txt b/src/webenginequick/CMakeLists.txt
index 9434d6908..dd4c8cd39 100644
--- a/src/webenginequick/CMakeLists.txt
+++ b/src/webenginequick/CMakeLists.txt
@@ -21,7 +21,8 @@ qt_internal_add_module(WebEngineQuick
         api/qquickwebenginetouchhandleprovider_p_p.h
         api/qquickwebengineview.cpp api/qquickwebengineview_p.h
         api/qquickwebengineview_p_p.h
-        api/qtwebengineglobal.cpp api/qtwebengineglobal.h api/qtwebengineglobal_p.h
+        api/qtwebenginequickglobal.cpp api/qtwebenginequickglobal.h
+        api/qtwebenginequickglobal_p.h
         render_widget_host_view_qt_delegate_quick.cpp render_widget_host_view_qt_delegate_quick.h
         render_widget_host_view_qt_delegate_quickwindow.cpp render_widget_host_view_qt_delegate_quickwindow.h
         ui_delegates_manager.cpp ui_delegates_manager.h
diff --git a/src/webenginequick/api/qquickwebengineaction_p.h b/src/webenginequick/api/qquickwebengineaction_p.h
index 8f5f3386c..c429d8917 100644
--- a/src/webenginequick/api/qquickwebengineaction_p.h
+++ b/src/webenginequick/api/qquickwebengineaction_p.h
@@ -53,7 +53,7 @@
 
 #include <QObject>
 #include <QtQml/qqml.h>
-#include "qtwebengineglobal_p.h"
+#include "qtwebenginequickglobal_p.h"
 #include <QVariant>
 
 namespace QtWebEngineCore {
diff --git a/src/webenginequick/api/qquickwebengineaction_p_p.h b/src/webenginequick/api/qquickwebengineaction_p_p.h
index d2ead30e9..e5093f89f 100644
--- a/src/webenginequick/api/qquickwebengineaction_p_p.h
+++ b/src/webenginequick/api/qquickwebengineaction_p_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <QObject>
-#include "qtwebengineglobal_p.h"
+#include "qtwebenginequickglobal_p.h"
 #include <QVariant>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/webenginequick/api/qquickwebengineclientcertificateselection_p.h b/src/webenginequick/api/qquickwebengineclientcertificateselection_p.h
index a62150404..1e05f4fcd 100644
--- a/src/webenginequick/api/qquickwebengineclientcertificateselection_p.h
+++ b/src/webenginequick/api/qquickwebengineclientcertificateselection_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtWebEngineQuick/private/qtwebengineglobal_p.h>
+#include <QtWebEngineQuick/private/qtwebenginequickglobal_p.h>
 
 #include <QtCore/QDateTime>
 #include <QtCore/QObject>
diff --git a/src/webenginequick/api/qquickwebenginedialogrequests_p.h b/src/webenginequick/api/qquickwebenginedialogrequests_p.h
index f3b5997d0..f4c206875 100644
--- a/src/webenginequick/api/qquickwebenginedialogrequests_p.h
+++ b/src/webenginequick/api/qquickwebenginedialogrequests_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtWebEngineQuick/private/qtwebengineglobal_p.h>
+#include <QtWebEngineQuick/private/qtwebenginequickglobal_p.h>
 #include <QtCore/QUrl>
 #include <QtCore/QWeakPointer>
 #include <QtCore/QRect>
diff --git a/src/webenginequick/api/qquickwebenginefaviconprovider_p_p.h b/src/webenginequick/api/qquickwebenginefaviconprovider_p_p.h
index d284a73d5..922f8b3ac 100644
--- a/src/webenginequick/api/qquickwebenginefaviconprovider_p_p.h
+++ b/src/webenginequick/api/qquickwebenginefaviconprovider_p_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtWebEngineQuick/private/qtwebengineglobal_p.h>
+#include <QtWebEngineQuick/private/qtwebenginequickglobal_p.h>
 #include <QtCore/QList>
 #include <QtQuick/QQuickImageProvider>
 
diff --git a/src/webenginequick/api/qquickwebengineprofile.h b/src/webenginequick/api/qquickwebengineprofile.h
index 93a7fbfdc..8d71d3303 100644
--- a/src/webenginequick/api/qquickwebengineprofile.h
+++ b/src/webenginequick/api/qquickwebengineprofile.h
@@ -40,7 +40,7 @@
 #ifndef QQUICKWEBENGINEPROFILE_H
 #define QQUICKWEBENGINEPROFILE_H
 
-#include <QtWebEngineQuick/qtwebengineglobal.h>
+#include <QtWebEngineQuick/qtwebenginequickglobal.h>
 #include <QtCore/QObject>
 #include <QtCore/QScopedPointer>
 #include <QtCore/QString>
diff --git a/src/webenginequick/api/qquickwebenginescriptcollection.h b/src/webenginequick/api/qquickwebenginescriptcollection.h
index e125fee96..b296ecbf4 100644
--- a/src/webenginequick/api/qquickwebenginescriptcollection.h
+++ b/src/webenginequick/api/qquickwebenginescriptcollection.h
@@ -40,7 +40,7 @@
 #ifndef QQUICKWEBENGINESCRIPTCOLLECTION_H
 #define QQUICKWEBENGINESCRIPTCOLLECTION_H
 
-#include <QtWebEngineQuick/qtwebengineglobal.h>
+#include <QtWebEngineQuick/qtwebenginequickglobal.h>
 #include <QtWebEngineCore/qwebenginescript.h>
 #include <QtCore/qscopedpointer.h>
 #include <QtCore/qlist.h>
diff --git a/src/webenginequick/api/qquickwebenginesettings_p.h b/src/webenginequick/api/qquickwebenginesettings_p.h
index f400172e1..f3c55693b 100644
--- a/src/webenginequick/api/qquickwebenginesettings_p.h
+++ b/src/webenginequick/api/qquickwebenginesettings_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtWebEngineQuick/private/qtwebengineglobal_p.h>
+#include <QtWebEngineQuick/private/qtwebenginequickglobal_p.h>
 #include <QObject>
 #include <QScopedPointer>
 
diff --git a/src/webenginequick/api/qquickwebenginesingleton_p.h b/src/webenginequick/api/qquickwebenginesingleton_p.h
index 224bfa495..9dc7090d8 100644
--- a/src/webenginequick/api/qquickwebenginesingleton_p.h
+++ b/src/webenginequick/api/qquickwebenginesingleton_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtWebEngineQuick/private/qtwebengineglobal_p.h>
+#include <QtWebEngineQuick/private/qtwebenginequickglobal_p.h>
 #include <QtWebEngineCore/qwebenginescript.h>
 #include <QtCore/qobject.h>
 
diff --git a/src/webenginequick/api/qquickwebenginetestsupport_p.h b/src/webenginequick/api/qquickwebenginetestsupport_p.h
index 8f8bfde4d..853c7cbde 100644
--- a/src/webenginequick/api/qquickwebenginetestsupport_p.h
+++ b/src/webenginequick/api/qquickwebenginetestsupport_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <QtGui/private/qinputmethod_p.h>
-#include <QtWebEngineQuick/private/qtwebengineglobal_p.h>
+#include <QtWebEngineQuick/private/qtwebenginequickglobal_p.h>
 
 #include <QEvent>
 #include <QObject>
diff --git a/src/webenginequick/api/qquickwebenginetouchhandleprovider_p_p.h b/src/webenginequick/api/qquickwebenginetouchhandleprovider_p_p.h
index 8f5f8cc94..fac136fe6 100644
--- a/src/webenginequick/api/qquickwebenginetouchhandleprovider_p_p.h
+++ b/src/webenginequick/api/qquickwebenginetouchhandleprovider_p_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <QtQuick/QQuickImageProvider>
-#include <QtWebEngineQuick/private/qtwebengineglobal_p.h>
+#include <QtWebEngineQuick/private/qtwebenginequickglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/webenginequick/api/qquickwebengineview_p.h b/src/webenginequick/api/qquickwebengineview_p.h
index 0ec0e91e1..b3c092856 100644
--- a/src/webenginequick/api/qquickwebengineview_p.h
+++ b/src/webenginequick/api/qquickwebengineview_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <QtWebEngineCore/qtwebenginecoreglobal.h>
-#include <QtWebEngineQuick/private/qtwebengineglobal_p.h>
+#include <QtWebEngineQuick/private/qtwebenginequickglobal_p.h>
 #include <QQuickItem>
 #include <QtGui/qcolor.h>
 
diff --git a/src/webenginequick/api/qtwebengineglobal.cpp b/src/webenginequick/api/qtwebenginequickglobal.cpp
index 7d2b91e90..68e4a7c3b 100644
--- a/src/webenginequick/api/qtwebengineglobal.cpp
+++ b/src/webenginequick/api/qtwebenginequickglobal.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "qtwebengineglobal.h"
+#include <QtWebEngineQuick/qtwebenginequickglobal.h>
 #include <QCoreApplication>
 #include <QQuickWindow>
 
@@ -48,21 +48,21 @@ namespace QtWebEngineCore
 
 QT_BEGIN_NAMESPACE
 
-namespace QtWebEngine {
+namespace QtWebEngineQuick {
 
 /*!
-    \namespace QtWebEngine
-    \inmodule QtWebEngine
+    \namespace QtWebEngineQuick
+    \inmodule QtWebEngineQuick
     \ingroup qtwebengine-namespaces
     \keyword QtWebEngine Namespace
 
     \brief Helper functions for the \QWE (Qt Quick) module.
 
-    The \l[CPP]{QtWebEngine} namespace is part of the \QWE module.
+    The \l[CPP]{QtWebEngineQuick} namespace is part of the \QWE module.
 */
 
 /*!
-    \fn QtWebEngine::initialize()
+    \fn QtWebEngineQuick::initialize()
 
     Sets up an OpenGL Context that can be shared between threads. This has to be done before
     QGuiApplication is created and before window's QPlatformOpenGLContext is created.
@@ -74,7 +74,7 @@ namespace QtWebEngine {
 void initialize()
 {
     if (!QCoreApplication::startingUp()) {
-        qWarning("QtWebEngine::initialize() called with QCoreApplication object already created and should be call before. "\
+        qWarning("QtWebEngineQuick::initialize() called with QCoreApplication object already created and should be call before. "\
                  "This is depreciated and may fail in the future.");
         QtWebEngineCore::initialize();
         return;
@@ -83,6 +83,6 @@ void initialize()
     qAddPreRoutine(QtWebEngineCore::initialize);
     QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGLRhi);
 }
-} // namespace QtWebEngine
+} // namespace QtWebEngineQuick
 
 QT_END_NAMESPACE
diff --git a/src/webenginequick/api/qtwebengineglobal.h b/src/webenginequick/api/qtwebenginequickglobal.h
index 50a91b745..c94bd66d3 100644
--- a/src/webenginequick/api/qtwebengineglobal.h
+++ b/src/webenginequick/api/qtwebenginequickglobal.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QTWEBENGINEGLOBAL_H
-#define QTWEBENGINEGLOBAL_H
+#ifndef QTWEBENGINEQUICKGLOBAL_H
+#define QTWEBENGINEQUICKGLOBAL_H
 
 #include <QtCore/qglobal.h>
 #include <QtWebEngineQuick/qtwebenginequick-config.h>
@@ -55,11 +55,11 @@ QT_BEGIN_NAMESPACE
 #  define Q_WEBENGINE_EXPORT
 #endif
 
-namespace QtWebEngine
+namespace QtWebEngineQuick
 {
     Q_WEBENGINE_EXPORT void initialize();
 }
 
 QT_END_NAMESPACE
 
-#endif // QTWEBENGINEGLOBAL_H
+#endif // QTWEBENGINEQUICKGLOBAL_H
diff --git a/src/webenginequick/api/qtwebengineglobal_p.h b/src/webenginequick/api/qtwebenginequickglobal_p.h
index 549de30d2..5d8909c18 100644
--- a/src/webenginequick/api/qtwebengineglobal_p.h
+++ b/src/webenginequick/api/qtwebenginequickglobal_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QTWEBENGINEGLOBAL_P_H
-#define QTWEBENGINEGLOBAL_P_H
+#ifndef QTWEBENGINEQUICKGLOBAL_P_H
+#define QTWEBENGINEQUICKGLOBAL_P_H
 
 //
 //  W A R N I N G
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtWebEngineQuick/qtwebengineglobal.h>
+#include <QtWebEngineQuick/qtwebenginequickglobal.h>
 #include <QtCore/private/qglobal_p.h>
 #include <QtWebEngineQuick/private/qtwebenginequick-config_p.h>
 
@@ -61,4 +61,4 @@ QT_BEGIN_NAMESPACE
 
 QT_END_NAMESPACE
 
-#endif // QTWEBENGINEGLOBAL_P_H
+#endif // QTWEBENGINEQUICKGLOBAL_P_H
diff --git a/src/webenginequick/doc/src/qtwebengine-debugging.qdoc b/src/webenginequick/doc/src/qtwebengine-debugging.qdoc
index 0db35c85c..f84cca312 100644
--- a/src/webenginequick/doc/src/qtwebengine-debugging.qdoc
+++ b/src/webenginequick/doc/src/qtwebengine-debugging.qdoc
@@ -113,5 +113,5 @@
     \endcode
 
     QTWEBENGINE_CHROMIUM_FLAGS can also be set using {qputenv} from within the
-    application if called before QtWebEngine::initialize().
+    application if called before QtWebEngineQuick::initialize().
 */
diff --git a/src/webenginequick/doc/src/qtwebengine-overview.qdoc b/src/webenginequick/doc/src/qtwebengine-overview.qdoc
index 4cbe35bcc..c7aaffc4e 100644
--- a/src/webenginequick/doc/src/qtwebengine-overview.qdoc
+++ b/src/webenginequick/doc/src/qtwebengine-overview.qdoc
@@ -123,14 +123,14 @@
 
     For a widget based application, the web engine is automatically initialized, unless it is
     placed in a plugin. In that case, it must be initialized in the application main source file
-    by using \l QtWebEngine::initialize, as illustrated by the following code snippet:
+    by using \l QtWebEngineQuick::initialize, as illustrated by the following code snippet:
 
     \code
     int main(int argc, char **argv)
     {
         QApplication app(argc, argv);
 
-        QtWebEngine::initialize();
+        QtWebEngineQuick::initialize();
 
         QMainWindow window;
         window.show();
@@ -146,7 +146,7 @@
     full screen as specified within the Qt Quick application.
 
     To make sure that OpenGL context can be shared between the GUI and render processes, the web
-    engine must be initialized by using \l QtWebEngine::initialize in the application main source
+    engine must be initialized by using \l QtWebEngineQuick::initialize in the application main source
     file, as illustrated by the following code snippet:
 
     \code
@@ -154,7 +154,7 @@
     {
         QGuiApplication app(argc, argv);
 
-        QtWebEngine::initialize();
+        QtWebEngineQuick::initialize();
 
         QQmlApplicationEngine engine;
         engine.load(QUrl("qrc:/main.qml"));
diff --git a/src/webenginequick/doc/src/webengineview_lgpl.qdoc b/src/webenginequick/doc/src/webengineview_lgpl.qdoc
index 498088a4a..1ea484703 100644
--- a/src/webenginequick/doc/src/webengineview_lgpl.qdoc
+++ b/src/webenginequick/doc/src/webengineview_lgpl.qdoc
@@ -38,7 +38,7 @@
     \section2 Initializing Web Engine
 
     For the web engine view to be rendered, the web engine must be initialized by using
-    \l QtWebEngine::initialize in the application main source file, as illustrated by the
+    \l QtWebEngineQuick::initialize in the application main source file, as illustrated by the
     following code snippet:
 
     \quotefromfile webengine/minimal/main.cpp
@@ -137,7 +137,7 @@
 
     When using a QQuickRenderControl to render a Qt Quick user interface to an OpenGL surface, the
     WebEngineView type is not rendered correctly. The web engine view attempts to use a global
-    OpenGL context created by \l QtWebEngine::initialize, but there is no public API for accessing
+    OpenGL context created by \l QtWebEngineQuick::initialize, but there is no public API for accessing
     that context in order to share it with the \c QQuickRenderControl context.
 
     To have the web engine view rendered correctly, it is possible to manually create a new
diff --git a/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp b/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
index ef8e74a31..2879895ca 100644
--- a/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
+++ b/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
@@ -62,7 +62,7 @@ private:
 tst_InspectorServer::tst_InspectorServer()
 {
     qputenv("QTWEBENGINE_REMOTE_DEBUGGING", INSPECTOR_SERVER_PORT);
-    QtWebEngine::initialize();
+    QtWebEngineQuick::initialize();
     QQuickWebEngineProfile::defaultProfile()->setOffTheRecord(true);
     prepareWebViewComponent();
 }
diff --git a/tests/auto/quick/qmltests/tst_qmltests.cpp b/tests/auto/quick/qmltests/tst_qmltests.cpp
index d9be0a773..689c47995 100644
--- a/tests/auto/quick/qmltests/tst_qmltests.cpp
+++ b/tests/auto/quick/qmltests/tst_qmltests.cpp
@@ -147,7 +147,7 @@ int main(int argc, char **argv)
     if (!QCoreApplication::instance()) {
         app.reset(new Application(w_argc, const_cast<char **>(w_argv.data())));
     }
-    QtWebEngine::initialize();
+    QtWebEngineQuick::initialize();
     QQuickWebEngineProfile::defaultProfile()->setOffTheRecord(true);
     qmlRegisterType<TempDir>("Test.util", 1, 0, "TempDir");
 
diff --git a/tests/auto/quick/qquickwebenginedefaultsurfaceformat/tst_qquickwebenginedefaultsurfaceformat.cpp b/tests/auto/quick/qquickwebenginedefaultsurfaceformat/tst_qquickwebenginedefaultsurfaceformat.cpp
index 99ed8a061..d75157026 100644
--- a/tests/auto/quick/qquickwebenginedefaultsurfaceformat/tst_qquickwebenginedefaultsurfaceformat.cpp
+++ b/tests/auto/quick/qquickwebenginedefaultsurfaceformat/tst_qquickwebenginedefaultsurfaceformat.cpp
@@ -116,7 +116,7 @@ void tst_QQuickWebEngineDefaultSurfaceFormat::customDefaultSurfaceFormat()
     QSurfaceFormat::setDefaultFormat( format );
 
     QGuiApplication app(argc, argv);
-    QtWebEngine::initialize();
+    QtWebEngineQuick::initialize();
 
     initEngineAndViewComponent();
     initWindow();
diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
index 92ba16760..63dbf0452 100644
--- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
+++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
@@ -108,7 +108,7 @@ private:
 
 tst_QQuickWebEngineView::tst_QQuickWebEngineView()
 {
-    QtWebEngine::initialize();
+    QtWebEngineQuick::initialize();
     QQuickWebEngineProfile::defaultProfile()->setOffTheRecord(true);
 
     m_testSourceDirPath = QDir(QT_TESTCASE_SOURCEDIR).canonicalPath();
diff --git a/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp b/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp
index 518ddaa0d..d04a88510 100644
--- a/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp
+++ b/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp
@@ -33,7 +33,7 @@
 #include <QQuickView>
 #include <QQuickItem>
 #include <QPainter>
-#include <qtwebengineglobal.h>
+#include <QtWebEngineQuick/qtwebenginequickglobal.h>
 #include <private/qquickwebengineview_p.h>
 
 #include <map>
diff --git a/tests/auto/quick/qtbug-70248/tst_qtbug-70248.cpp b/tests/auto/quick/qtbug-70248/tst_qtbug-70248.cpp
index 3dffa1d84..6f48c957f 100644
--- a/tests/auto/quick/qtbug-70248/tst_qtbug-70248.cpp
+++ b/tests/auto/quick/qtbug-70248/tst_qtbug-70248.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include "qtwebengineglobal.h"
+#include "qtwebenginequickglobal.h"
 #include <QQuickWebEngineProfile>
 #include <QQmlApplicationEngine>
 #include <QQuickWindow>
@@ -43,7 +43,7 @@ private slots:
 
 void tst_qtbug_70248::test()
 {
-    QtWebEngine::initialize();
+    QtWebEngineQuick::initialize();
     QScopedPointer<QQmlApplicationEngine> engine;
     QQuickWebEngineProfile::defaultProfile()->setOffTheRecord(true);
     engine.reset(new QQmlApplicationEngine());
diff --git a/tests/auto/util/qt_webengine_quicktest.h b/tests/auto/util/qt_webengine_quicktest.h
index 55ccd9f33..3fba3b905 100644
--- a/tests/auto/util/qt_webengine_quicktest.h
+++ b/tests/auto/util/qt_webengine_quicktest.h
@@ -38,7 +38,7 @@
 #endif
 
 #include "qopenglcontext.h"
-#include <qtwebengineglobal.h>
+#include <QtWebEngineQuick/qtwebenginequickglobal.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/tests/auto/util/quickutil.h b/tests/auto/util/quickutil.h
index cfaf89df9..323fe3df4 100644
--- a/tests/auto/util/quickutil.h
+++ b/tests/auto/util/quickutil.h
@@ -171,7 +171,7 @@ inline QString activeElementId(QQuickWebEngineView *webEngineView)
 #define W_QTEST_MAIN(TestObject, params) \
 int main(int argc, char *argv[]) \
 { \
-    QtWebEngine::initialize(); \
+    QtWebEngineQuick::initialize(); \
     \
     QList<const char *> w_argv(argc); \
     for (int i = 0; i < argc; ++i) \
diff --git a/tests/manual/quick/touchbrowser/main.cpp b/tests/manual/quick/touchbrowser/main.cpp
index cc83b675a..ffbe81179 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 <QtWebEngineQuick/qtwebengineglobal.h>
+#include <QtWebEngineQuick/qtwebenginequickglobal.h>
 
 static QUrl startupUrl()
 {
@@ -72,7 +72,7 @@ int main(int argc, char **argv)
 
     int qAppArgCount = qargv.size();
 
-    QtWebEngine::initialize();
+    QtWebEngineQuick::initialize();
 
 #if defined(DESKTOP_BUILD)
     TouchMockingApplication app(qAppArgCount, qargv.data());
diff --git a/tests/quicktestbrowser/main.cpp b/tests/quicktestbrowser/main.cpp
index 9dc0c2dee..cb21518c9 100644
--- a/tests/quicktestbrowser/main.cpp
+++ b/tests/quicktestbrowser/main.cpp
@@ -38,7 +38,7 @@ typedef QGuiApplication Application;
 #include <QtQml/QQmlApplicationEngine>
 #include <QtQml/QQmlContext>
 #include <QtQml/QQmlComponent>
-#include <QtWebEngineQuick/qtwebengineglobal.h>
+#include <QtWebEngineQuick/qtwebenginequickglobal.h>
 #include <QtWebEngineQuick/QQuickWebEngineProfile>
 #include <QtWebEngineCore/qwebenginecookiestore.h>
 
@@ -64,7 +64,7 @@ int main(int argc, char **argv)
     // Enable dev tools by default for the test browser
     if (qgetenv("QTWEBENGINE_REMOTE_DEBUGGING").isNull())
         qputenv("QTWEBENGINE_REMOTE_DEBUGGING", "1337");
-    QtWebEngine::initialize();
+    QtWebEngineQuick::initialize();
 
     QQmlApplicationEngine appEngine;
     Utils utils;