diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-18 09:47:34 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-18 10:08:28 +0200 |
| commit | e53ddd7b7ec0ca766557d947031820986f11b1a2 (patch) | |
| tree | 19f7d4c09af27da94bda2dd0ff647b1913b70a67 /src/core/gl_surface_qt.cpp | |
| parent | 13d03ef21d3bd67595bd0b36be7401f6e6bcbbd6 (diff) | |
| parent | dd7b409388949bc628af75a6e65474d699c416d3 (diff) | |
Merge branch '5.5' into 5.6
Change-Id: I9977663123560a22f493b8c02d02de8897b38666
Diffstat (limited to 'src/core/gl_surface_qt.cpp')
| -rw-r--r-- | src/core/gl_surface_qt.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/core/gl_surface_qt.cpp b/src/core/gl_surface_qt.cpp index 19ce59f7e..c905688ce 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; |