diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-12 19:42:17 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-12 19:42:17 (GMT) |
| commit | 7bf8fb931459c56135feb2d0168431f393259db2 (patch) | |
| tree | 3cd60af8028637e8be5ad5bce0cea191e3dc34d0 /src/opengl/qgl.cpp | |
| parent | 9c2522f2e28c2f22b24500b51ed37590666c1f84 (diff) | |
| parent | dfb0f8600187b44c3a3e10ef40ae2733de88f241 (diff) | |
| download | Qt-7bf8fb931459c56135feb2d0168431f393259db2.zip Qt-7bf8fb931459c56135feb2d0168431f393259db2.tar.gz Qt-7bf8fb931459c56135feb2d0168431f393259db2.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/opengl/qgl.cpp')
| -rw-r--r-- | src/opengl/qgl.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index cb31491..c4d2bd5 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -5325,8 +5325,6 @@ QGLExtensions::Extensions QGLExtensions::currentContextExtensions() glExtensions |= FragmentShader; if (extensions.match("GL_ARB_shader_objects")) glExtensions |= FragmentShader; - if (extensions.match("GL_ARB_ES2_compatibility")) - glExtensions |= ES2Compatibility; if (extensions.match("GL_ARB_texture_mirrored_repeat")) glExtensions |= MirroredRepeat; if (extensions.match("GL_EXT_framebuffer_object")) @@ -5347,7 +5345,6 @@ QGLExtensions::Extensions QGLExtensions::currentContextExtensions() glExtensions |= FramebufferObject; glExtensions |= GenerateMipmap; glExtensions |= FragmentShader; - glExtensions |= ES2Compatibility; #endif #if defined(QT_OPENGL_ES_1) if (extensions.match("GL_OES_framebuffer_object")) |