From 6e6e2655bf03f2cc903f17d9e5283a81a4a837c2 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Date: Wed, 12 Aug 2015 14:02:28 +0200
Subject: Fix crash on XCB GLES2 and Wayland

We can and must request the "egldisplay" from QPA, otherwise we get
the wrong resource.

Task-number: QTBUG-47301
Change-Id: I8bcd94415aa8f22b0d868ad751017f5babddf751
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
---
 src/core/gl_surface_qt.cpp | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'src/core')

diff --git a/src/core/gl_surface_qt.cpp b/src/core/gl_surface_qt.cpp
index 5a27aa98f..584bdc227 100644
--- a/src/core/gl_surface_qt.cpp
+++ b/src/core/gl_surface_qt.cpp
@@ -324,13 +324,7 @@ bool GLSurfaceQtEGL::InitializeOneOff()
     if (initialized)
         return true;
 
-#if defined(USE_X11)
-    EGLNativeDisplayType nativeDisplay = reinterpret_cast<EGLNativeDisplayType>(GLContextHelper::getXDisplay());
-    g_display = eglGetDisplay(nativeDisplay);
-#else
     g_display = GLContextHelper::getEGLDisplay();
-#endif
-
     if (!g_display) {
         LOG(ERROR) << "GLContextHelper::getEGLDisplay() failed.";
         return false;
-- 
cgit v1.2.3