diff options
author | Michal Klocek <michal.klocek@qt.io> | 2021-06-01 17:26:36 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-15 17:29:50 +0000 |
commit | 5f4fb14cb0f6b443885e79516f450853e44f650d (patch) | |
tree | aefc9b4cea1e64ea51f02c5d99ce22206d87488c /src/core/api | |
parent | 8d23c52719a23dea77a75a959ca3462e38de259c (diff) |
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>
Diffstat (limited to 'src/core/api')
-rw-r--r-- | src/core/api/qtwebenginecoreglobal.cpp | 8 | ||||
-rw-r--r-- | src/core/api/qwebenginenewwindowrequest.h | 2 |
2 files changed, 5 insertions, 5 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> |