1 files changed, 10 insertions, 3 deletions
diff --git a/src/core/ozone/gl_context_qt.cpp b/src/core/ozone/gl_context_qt.cpp
index ec49414b0..c4a075544 100644
--- a/src/core/ozone/gl_context_qt.cpp
+++ b/src/core/ozone/gl_context_qt.cpp
@@ -119,14 +119,21 @@ void* GLContextHelper::getGlXConfig()
 
 void* GLContextHelper::getEGLDisplay()
 {
+#ifdef Q_OS_WIN
+    // Windows QPA plugin does not implement resourceForIntegration for "egldisplay".
+    // Use resourceForContext instead.
+    return resourceForContext(QByteArrayLiteral("egldisplay"));
+#else
     return resourceForIntegration(QByteArrayLiteral("egldisplay"));
+#endif
 }
 
 void* GLContextHelper::getXDisplay()
 {
-    if (QGuiApplication::platformName() != QLatin1String("xcb"))
-        return nullptr;
-    return qApp->platformNativeInterface()->nativeResourceForScreen(QByteArrayLiteral("display"), qApp->primaryScreen());
+    QPlatformNativeInterface *pni = QGuiApplication::platformNativeInterface();
+    if (pni)
+        return pni->nativeResourceForScreen(QByteArrayLiteral("display"), qApp->primaryScreen());
+    return nullptr;
 }
 
 void* GLContextHelper::getNativeDisplay()