Fixed various valgrind-reported issues in GL 2 engine.

2 files changed, 2 insertions, 3 deletions

diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
index 8122a08..884e687 100644
--- a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
+++ b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h
@@ -428,10 +428,9 @@ private:
     QGLShaderProgram*     simpleShaderProg;
     QGLEngineShaderProg*  currentShaderProg;
 
-    QCache<QByteArray, QGLShader> customShaderCache;
-
     // TODO: Possibly convert to a LUT
     QList<QGLEngineShaderProg> cachedPrograms;
+    QCache<QByteArray, QGLShader> customShaderCache;
 
     QGLShader* compiledShaders[TotalShaderCount];
 
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
index 3ff2dca..6a96877 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
@@ -150,7 +150,7 @@ public:
             q(q_ptr),
             width(0), height(0),
             ctx(0),
-            currentBrush( &(q->state()->brush) ),
+            currentBrush(0),
             inverseScale(1),
             shaderManager(0)
     { }