summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulian de Bhal <julian.debhal@nokia.com>2009-10-20 02:32:19 (GMT)
committerJulian de Bhal <julian.debhal@nokia.com>2009-10-20 02:34:54 (GMT)
commit31fefc7cc9dc01be244b362ada1c1b2f8aad7c47 (patch)
tree6a488f9537be8a32d550162678838c6506ac7386
parent420be4ee3d98c093c71cc840192138da6b5e61d2 (diff)
downloadQt-31fefc7cc9dc01be244b362ada1c1b2f8aad7c47.zip
Qt-31fefc7cc9dc01be244b362ada1c1b2f8aad7c47.tar.gz
Qt-31fefc7cc9dc01be244b362ada1c1b2f8aad7c47.tar.bz2
Fix dangling shader manager pointers
The QGLEngineShaderManager pointers in QGLCustomShaderStagePrivate have been changed to QPointers to prevent the QGLPixmapFilters in QGL2PaintEngineEx from dereferencing the QGLEngineShaderManager after it is destroyed. Reviewed-by: Rhys Weatherley
-rw-r--r--src/opengl/gl2paintengineex/qglcustomshaderstage.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/gl2paintengineex/qglcustomshaderstage.cpp b/src/opengl/gl2paintengineex/qglcustomshaderstage.cpp
index 24606bc..ab2026c 100644
--- a/src/opengl/gl2paintengineex/qglcustomshaderstage.cpp
+++ b/src/opengl/gl2paintengineex/qglcustomshaderstage.cpp
@@ -52,7 +52,7 @@ public:
QGLCustomShaderStagePrivate() :
m_manager(0) {}
- QGLEngineShaderManager* m_manager;
+ QPointer<QGLEngineShaderManager> m_manager;
QByteArray m_source;
};