Fix QWebEngineQuick namespace for webenginequick module

This is followup change for QtWebEngineQuick rename.

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

Pick-to: 6.2
Change-Id: I90acab04ff0240b399a863c88eff915efa360f6f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

19 files changed, 37 insertions, 36 deletions

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