summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Varga <pvarga@inf.u-szeged.hu>2023-01-23 11:22:49 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-02-01 20:32:28 +0000
commit5dd914782b9e733dca7f4796a4f712288a9389f2 (patch)
tree93422bd9bd65b5b377bf59bd0e80da8fc93331ae
parentbb2b1da47081b49fc945498261f40402b225be09 (diff)
Replace QtWebEngineCore::initialize() with QtWebEngineQuick::initialize() in error messages
Also fix typos. Change-Id: I6e505102dc2241e4e00b181d0c4a097af4a40d35 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit a4cebe374b59f2e30074deac625529820d475130) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/core/ozone/gl_context_qt.cpp3
-rw-r--r--src/core/ozone/gl_share_context_qt.cpp6
-rw-r--r--src/core/web_engine_context.cpp2
3 files changed, 6 insertions, 5 deletions
diff --git a/src/core/ozone/gl_context_qt.cpp b/src/core/ozone/gl_context_qt.cpp
index 75f8e8422..08d626063 100644
--- a/src/core/ozone/gl_context_qt.cpp
+++ b/src/core/ozone/gl_context_qt.cpp
@@ -27,7 +27,8 @@ 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 QtWebEngineCore::initialize() in your main() function.");
+ qFatal("QWebEngine: OpenGL resource sharing is not set up in QtQuick. Please make sure to "
+ "call QtWebEngineQuick::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 1ed5a48e4..086317b46 100644
--- a/src/core/ozone/gl_share_context_qt.cpp
+++ b/src/core/ozone/gl_share_context_qt.cpp
@@ -42,7 +42,7 @@ QtShareGLContext::QtShareGLContext(QOpenGLContext *context)
m_handle = (void *)egl_ctx->nativeContext();
#endif
if (!m_handle)
- qFatal("Could not get handle for shared contex");
+ qFatal("Could not get handle for shared context.");
#endif // QT_CONFIG(opengl)
}
@@ -65,8 +65,8 @@ 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 QtWebEngineCore::initialize() in your main() function before QCoreApplication is "
- "created.");
+ "call QtWebEngineQuick::initialize() in your main() function before "
+ "QCoreApplication is created.");
}
m_shareContextQt = new QtShareGLContext(shareContext);
#endif
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index 06a092ba3..6ce23b4ab 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -184,7 +184,7 @@ static const char *getGLType(bool enableGLSoftwareRendering, bool disableGpu)
return glType;
if (!qt_gl_global_share_context() || !qt_gl_global_share_context()->isValid()) {
- qWarning("WebEngineContext used before QtWebEngineCore::initialize() or OpenGL context "
+ qWarning("WebEngineContext is used before QtWebEngineQuick::initialize() or OpenGL context "
"creation failed.");
return glType;
}