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>

5 files changed, 8 insertions, 8 deletions

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();