diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2012-07-05 11:20:40 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-05 13:13:58 +0200 |
| commit | 87fbe79af2ecde090880d145a1ea9d66418ac734 (patch) | |
| tree | 6106c80fc7755c5f772c3560fc5b554e12b5d3a1 | |
| parent | 400813f58599efff4dfea8de7eae7e598873bab1 (diff) | |
Do not delete m_blitProgram more than once
When m_blitProgram is created the constructor will add it to
QOpenGLContext as a child of that QObject, so it will be deleted
when that QOpenGLContext is deleted as QObject will delete its
children in destructor. Delete it here will cause crash in
thread termination.
Change-Id: If9d3287d159cc3276b6a840a584a1b212b9c9fd0
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
| -rw-r--r-- | src/gui/opengl/qopengltextureglyphcache.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp index 790b92a686..a57c605afa 100644 --- a/src/gui/opengl/qopengltextureglyphcache.cpp +++ b/src/gui/opengl/qopengltextureglyphcache.cpp @@ -83,7 +83,6 @@ QOpenGLTextureGlyphCache::~QOpenGLTextureGlyphCache() #ifdef QT_GL_TEXTURE_GLYPH_CACHE_DEBUG qDebug(" -> ~QOpenGLTextureGlyphCache() %p.", this); #endif - delete m_blitProgram; } void QOpenGLTextureGlyphCache::createTextureData(int width, int height) |