diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-07 12:08:50 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-12-07 12:08:58 +0100 |
| commit | f4fbab32a05c556afdda4a9cd2bffd310e6c9569 (patch) | |
| tree | c3cf0795935bb00ce0c8e6fd1ab08041f51bc885 /src/core/gl_surface_qt.cpp | |
| parent | e3941dcdfcea6838243fa6cfdff2433867e502d6 (diff) | |
| parent | 9cc97f0c63049a8076476acc89c875c9e240abfb (diff) | |
Merge remote-tracking branch 'origin/5.7.1' into 5.8.0
Change-Id: I4f73844c730d52b00194ab6ff4abe35c59f7ef68
Diffstat (limited to 'src/core/gl_surface_qt.cpp')
| -rw-r--r-- | src/core/gl_surface_qt.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/gl_surface_qt.cpp b/src/core/gl_surface_qt.cpp index 74bb32d1f..4385b38cb 100644 --- a/src/core/gl_surface_qt.cpp +++ b/src/core/gl_surface_qt.cpp @@ -367,7 +367,8 @@ bool GLSurfaceQtEGL::InitializeOneOff() LOG(ERROR) << "eglInitialize failed with error " << GetLastEGLErrorString(); return false; } - +#if 0 +// QTBUG-57290 g_egl_surfaceless_context_supported = ExtensionsContain(g_extensions, "EGL_KHR_surfaceless_context"); if (g_egl_surfaceless_context_supported) { scoped_refptr<GLSurface> surface = new GLSurfacelessQtEGL(gfx::Size(1, 1)); @@ -384,7 +385,7 @@ bool GLSurfaceQtEGL::InitializeOneOff() context->ReleaseCurrent(surface.get()); } } - +#endif initialized = true; return true; } |