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_p.h | |
| 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_p.h')
| -rw-r--r-- | src/opengl/qgl_p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index 78f888a..f86a848 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -282,8 +282,7 @@ public: DDSTextureCompression = 0x00008000, ETC1TextureCompression = 0x00010000, PVRTCTextureCompression = 0x00020000, - FragmentShader = 0x00040000, - ES2Compatibility = 0x00080000 + FragmentShader = 0x00040000 }; Q_DECLARE_FLAGS(Extensions, Extension) |