diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-27 19:49:24 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-27 19:49:24 +1000 |
| commit | fadd87f448d3dd4133d1a6ec022ee6db42eb9723 (patch) | |
| tree | 502d7a9ceb35352751bf364225480d122ee6d50b /src/opengl/gl2paintengineex | |
| parent | 7ffa94149579448f7060b4483e886b5864d35027 (diff) | |
| parent | 1220069034f4ad28978427fc584fd63c410f526e (diff) | |
| download | qt4-tools-fadd87f448d3dd4133d1a6ec022ee6db42eb9723.tar.gz | |
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 possible crash in glyph cache when deleting and creating contexts
Diffstat (limited to 'src/opengl/gl2paintengineex')
| -rw-r--r-- | src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h b/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h index 83ca06d040..1a8bb0bb71 100644 --- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h +++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h @@ -144,6 +144,10 @@ public: void clear(); + void contextDeleted(const QGLContext *context) { + if (ctx == context) + ctx = 0; + } void freeResource(void *) { ctx = 0; } private: |