3 files changed, 14 insertions, 5 deletions
diff --git a/src/core/api/qtwebenginecoreglobal.cpp b/src/core/api/qtwebenginecoreglobal.cpp
index 25d0bd3be..3c7fc54a1 100644
--- a/src/core/api/qtwebenginecoreglobal.cpp
+++ b/src/core/api/qtwebenginecoreglobal.cpp
@@ -108,7 +108,7 @@ Q_WEBENGINECORE_PRIVATE_EXPORT void initialize()
 
     QCoreApplication *app = QCoreApplication::instance();
     if (!app) {
-        qFatal("QtWebEngine::initialize() must be called after the construction of the application object.");
+        qFatal("QtWebEngine::initialize() but no core application instance.");
         return;
     }
 
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
index 16945020b..04a8fc363 100644
--- a/src/core/content_browser_client_qt.cpp
+++ b/src/core/content_browser_client_qt.cpp
@@ -235,7 +235,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
diff --git a/src/webengine/api/qtwebengineglobal.cpp b/src/webengine/api/qtwebengineglobal.cpp
index a11618dba..4346832c9 100644
--- a/src/webengine/api/qtwebengineglobal.cpp
+++ b/src/webengine/api/qtwebengineglobal.cpp
@@ -38,6 +38,7 @@
 ****************************************************************************/
 
 #include "qtwebengineglobal.h"
+#include <QCoreApplication>
 
 namespace QtWebEngineCore
 {
@@ -62,8 +63,8 @@ namespace QtWebEngine {
 /*!
     \fn QtWebEngine::initialize()
 
-    Sets up an OpenGL Context that can be shared between threads. This has to be done after
-    QGuiApplication is created, but before a Qt Quick window is created.
+    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.
 
     This has the same effect as setting the Qt::AA_ShareOpenGLContexts
     attribute with QCoreApplication::setAttribute before constructing
@@ -71,7 +72,15 @@ namespace QtWebEngine {
 */
 void initialize()
 {
-    QtWebEngineCore::initialize();
+     QCoreApplication *app = QCoreApplication::instance();
+     if (app) {
+        qWarning("QtWebEngine::initialize() called with QCoreApplication object already created and should be call before. "\
+                 "This is depreciated and may fail in the future.");
+        QtWebEngineCore::initialize();
+        return;
+     }
+     // call initialize the same way as widgets do
+     qAddPreRoutine(QtWebEngineCore::initialize);
 }
 } // namespace QtWebEngine