diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-05 13:01:42 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-05 13:01:42 (GMT) |
| commit | 0ca404def7262ad7293592bbb7888a6df5ea27b7 (patch) | |
| tree | bdb81cd468bfcc1bb957c2ab9768b89c51c01525 /src/opengl/qglextensions_p.h | |
| parent | d1ac6af4f30e822e161fd8772104aa2e30e55a2f (diff) | |
| parent | 2d8852d51b15ed48e8e665882b5d70c298201299 (diff) | |
| download | Qt-0ca404def7262ad7293592bbb7888a6df5ea27b7.zip Qt-0ca404def7262ad7293592bbb7888a6df5ea27b7.tar.gz Qt-0ca404def7262ad7293592bbb7888a6df5ea27b7.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Compile on Windows
Support gamma correction of text on GL
Remove QFontEngineFT::loadGlyphMetrics
Make autotest more resilient against network timeout
Do not filter adhoc clients
Lancelot: Add configurable client filtering to baseline server
Improve error reporting on failure to connect to baseline server
Fixed bug in X11 backend when creating translucent windows.
Only cleanup share widget if it has been created.
Add required font metrics functions to QRawFont
Fixed bug in QPdfEngine::addImage causing mono images to be made 32 bit
Make pixel size a qreal in QRawFont
Make sure removed QTextBlock is invalid
Make sure QFont's resolve mask is copied on compilers with C++0x support
Fix glyph position issue with fallback fonts
Diffstat (limited to 'src/opengl/qglextensions_p.h')
| -rw-r--r-- | src/opengl/qglextensions_p.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/opengl/qglextensions_p.h b/src/opengl/qglextensions_p.h index 529c7a1..ac80ce8 100644 --- a/src/opengl/qglextensions_p.h +++ b/src/opengl/qglextensions_p.h @@ -477,6 +477,14 @@ struct QGLExtensionFuncs // OpenGL constants +#ifndef FRAMEBUFFER_SRGB_CAPABLE_EXT +#define FRAMEBUFFER_SRGB_CAPABLE_EXT 0x8DBA +#endif + +#ifndef FRAMEBUFFER_SRGB_EXT +#define FRAMEBUFFER_SRGB_EXT 0x8DB9 +#endif + #ifndef GL_ARRAY_BUFFER #define GL_ARRAY_BUFFER 0x8892 #endif |