1 files changed, 15 insertions, 7 deletions
diff --git a/src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp b/src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp
index e47f135e8..a39c0e483 100644
--- a/src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp
+++ b/src/webenginewidgets/api/qtwebenginewidgetsglobal.cpp
@@ -48,18 +48,26 @@ namespace QtWebEngineCore
 }
 
 QT_BEGIN_NAMESPACE
+
+#ifndef QT_NO_OPENGL
+Q_GUI_EXPORT QOpenGLContext *qt_gl_global_share_context();
+#endif
+
 static void initialize()
 {
-    //On window/ANGLE, calling QtWebEngine::initialize from DllMain will result in a crash.
-    //To ensure it doesn't, we check that when loading the library
-    //QCoreApplication is not yet instantiated, ensuring the call will be deferred
-#if defined(Q_OS_WIN)
-    if (QCoreApplication::instance()
-            && QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGLES) {
+#ifndef QT_NO_OPENGL
+    if (QCoreApplication::instance()) {
+        //On window/ANGLE, calling QtWebEngine::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 "
+                     "before constructing QGuiApplication.");
+        }
         return;
     }
-#endif
+    //QCoreApplication is not yet instantiated, ensuring the call will be deferred
     qAddPreRoutine(QtWebEngineCore::initialize);
+#endif // QT_NO_OPENGL
 }
 
 Q_CONSTRUCTOR_FUNCTION(initialize)