Reinstate GetQtXDisplay

Is needed by the X11-services with no working Ozone equivalent for
runtime detection of X11.

Change-Id: Iac79b5e29b9a8ef92af35209f3df40eb91c738f7
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

2 files changed, 8 insertions, 2 deletions

diff --git a/src/core/chromium_overrides.cpp b/src/core/chromium_overrides.cpp
index a497ddc46..841dcf4c9 100644
--- a/src/core/chromium_overrides.cpp
+++ b/src/core/chromium_overrides.cpp
@@ -92,6 +92,11 @@ void GetScreenInfoFromNativeWindow(QWindow* window, content::ScreenInfo* results
 
 } // namespace QtWebEngineCore
 
+void *GetQtXDisplay()
+{
+    return GLContextHelper::getXDisplay();
+}
+
 namespace content {
 class WebContentsImpl;
 class WebContentsView;
diff --git a/src/core/ozone/gl_context_qt.cpp b/src/core/ozone/gl_context_qt.cpp
index 1850380a2..ec49414b0 100644
--- a/src/core/ozone/gl_context_qt.cpp
+++ b/src/core/ozone/gl_context_qt.cpp
@@ -124,8 +124,9 @@ void* GLContextHelper::getEGLDisplay()
 
 void* GLContextHelper::getXDisplay()
 {
-    return qApp->platformNativeInterface()->nativeResourceForScreen(
-                QByteArrayLiteral("display"), qApp->primaryScreen());
+    if (QGuiApplication::platformName() != QLatin1String("xcb"))
+        return nullptr;
+    return qApp->platformNativeInterface()->nativeResourceForScreen(QByteArrayLiteral("display"), qApp->primaryScreen());
 }
 
 void* GLContextHelper::getNativeDisplay()