diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-14 20:11:37 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-14 20:11:37 (GMT) |
| commit | 036c0b1d9189cf5744662737ecb8a044c2bda80b (patch) | |
| tree | d8e07a0788ff872375cf3cccb847a7b45a9466fd /src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h | |
| parent | 01e03e91a0c6867205f5a3ab0306f0c6a067ffad (diff) | |
| parent | 77ddabd7fdf0c8ba2e15951e83abbcce18270285 (diff) | |
| download | Qt-036c0b1d9189cf5744662737ecb8a044c2bda80b.zip Qt-036c0b1d9189cf5744662737ecb8a044c2bda80b.tar.gz Qt-036c0b1d9189cf5744662737ecb8a044c2bda80b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Revert "Optimize QPixmapIconEngine's pixmap() function"
Limit the lower glyph texture cache size to 16x16 in GL.
Added workarounds for two MBX/SGX specific GL ES bugs/problems.
Add missing file!
Optimize QPixmapIconEngine's pixmap() function
Diffstat (limited to 'src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h')
| -rw-r--r-- | src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h b/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h index efb7435..6bcd655 100644 --- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h +++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h @@ -115,8 +115,6 @@ private: int m_height; QGLShaderProgram *m_program; - - bool m_broken_fbo_readback; }; QT_END_NAMESPACE |