diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-09-13 12:26:03 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-09-13 12:46:16 +0200 |
| commit | 06dc8791a70329dc8e985a0eed7e434d1f762ec5 (patch) | |
| tree | f3a9f55307207088676d4c48ec67ec418fa56053 /src/opengl/qgl_p.h | |
| parent | 59a2ff150795e1281e6b4fea435e74d3434a5ad2 (diff) | |
| parent | 31cc0b1820c0c8fdfdbc3d5b804f2dba2051c96f (diff) | |
| download | qt4-tools-06dc8791a70329dc8e985a0eed7e434d1f762ec5.tar.gz | |
Merge remote branch 'qt/master' into lighthouse-master
Conflicts:
configure
src/corelib/global/qglobal.h
src/corelib/tools/qsimd.cpp
Diffstat (limited to 'src/opengl/qgl_p.h')
| -rw-r--r-- | src/opengl/qgl_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index 0a5c649dec..13a10ba696 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -286,7 +286,8 @@ public: DDSTextureCompression = 0x00008000, ETC1TextureCompression = 0x00010000, PVRTCTextureCompression = 0x00020000, - FragmentShader = 0x00040000 + FragmentShader = 0x00040000, + ES2Compatibility = 0x00080000 }; Q_DECLARE_FLAGS(Extensions, Extension) |