From 87fbe79af2ecde090880d145a1ea9d66418ac734 Mon Sep 17 00:00:00 2001 From: Jiang Jiang Date: Thu, 5 Jul 2012 11:20:40 +0200 Subject: 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 --- src/gui/opengl/qopengltextureglyphcache.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/gui/opengl/qopengltextureglyphcache.cpp') 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) -- cgit v1.2.3