diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-28 21:42:03 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-28 21:42:03 (GMT) |
| commit | 53f16164661f8692aef9bd941b92697a047c0f4c (patch) | |
| tree | 16912d8c0c5a58eb726493415b60f6b18fb831f0 /src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h | |
| parent | 4da2ba2e788bb63a155e1d10ae559d4366eed875 (diff) | |
| parent | 2e7af8c4e8ced21ced3e7f23590faeffffa1e0ff (diff) | |
| download | Qt-53f16164661f8692aef9bd941b92697a047c0f4c.zip Qt-53f16164661f8692aef9bd941b92697a047c0f4c.tar.gz Qt-53f16164661f8692aef9bd941b92697a047c0f4c.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:
Fix crash and infinite recursion caused by previous commits
Fix remaining regressions in QWS
Take Xft.hintstyle by default to match the behavior of GTK+
Fixed remaining issues in subpixel positioning with FreeType
Fix QTransform debug output
qFloor the decoration line width before painting
Let QTextLine decide its own x position in QPainter
Avoid repeatedly trying to load unloadable plugins, causing slowness
Reset GL glyph cache when texture limit is reached
unlockFace was put in the wrong place in previous patch
Implement subpixel positioning with FreeType
Diffstat (limited to 'src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h')
| -rw-r--r-- | src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h b/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h index cc6de28..133289e 100644 --- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h +++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h @@ -142,6 +142,8 @@ public: FilterMode filterMode() const { return m_filterMode; } void setFilterMode(FilterMode m) { m_filterMode = m; } + void clear(); + void freeResource(void *) { ctx = 0; } private: |