diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-11-25 09:47:18 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-11-25 09:47:18 +0100 |
commit | cda76002257d56ffedbf8d28211cfd66a7226e73 (patch) | |
tree | 03e8a7fcdfa389771d6ade5afbe5d2536328eef2 /src/core/content_browser_client_qt.cpp | |
parent | b97f0eb87b6e6a6726b805c9de2159c6ad983f7d (diff) | |
parent | 631f1dd72027207cf6c49a380671c58f096a37a5 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/core/api/qtbug-60565.cpp
Change-Id: Iaad05aa248fb57a69033013161e10e3acddd48f6
Diffstat (limited to 'src/core/content_browser_client_qt.cpp')
-rw-r--r-- | src/core/content_browser_client_qt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp index 6fcd9ad5b..29b6e09ed 100644 --- a/src/core/content_browser_client_qt.cpp +++ b/src/core/content_browser_client_qt.cpp @@ -252,7 +252,7 @@ void ShareGroupQtQuick::AboutToAddFirstContext() // This currently has to be setup by ::main in all applications using QQuickWebEngineView with delegated rendering. 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 QtWebEngine::initialize() in your main() function before QCoreApplication is created."); } m_shareContextQtQuick = new QtShareGLContext(shareContext); #endif |