summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Cooksey <thomas.cooksey@nokia.com>2009-12-30 13:32:58 (GMT)
committerTom Cooksey <thomas.cooksey@nokia.com>2009-12-30 13:35:01 (GMT)
commitf953b7c40c28a5728125ba72b091d8b384e8858a (patch)
tree8d4784572d866afb24b5a1ca731fd5300aea1d4d
parentf005fb5b15eb387edb1a0d1da91639ac4cc1e67b (diff)
downloadQt-f953b7c40c28a5728125ba72b091d8b384e8858a.zip
Qt-f953b7c40c28a5728125ba72b091d8b384e8858a.tar.gz
Qt-f953b7c40c28a5728125ba72b091d8b384e8858a.tar.bz2
Also delete blitShader & simpleShader in ~QGLEngineSharedShaders
Reviewed-By: Trustme
-rw-r--r--src/opengl/gl2paintengineex/qglengineshadermanager.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
index b026e29..326ea1f 100644
--- a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
+++ b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
@@ -223,6 +223,16 @@ QGLEngineSharedShaders::~QGLEngineSharedShaders()
QList<QGLEngineShaderProg*>::iterator itr;
for (itr = cachedPrograms.begin(); itr != cachedPrograms.end(); ++itr)
delete *itr;
+
+ if (blitShaderProg) {
+ delete blitShaderProg;
+ blitShaderProg = 0;
+ }
+
+ if (simpleShaderProg) {
+ delete simpleShaderProg;
+ simpleShaderProg = 0;
+ }
}
#if defined (QT_DEBUG)