Fixed crash in tst_qgl.

The shader manager needs to be recreated since the context it was
created with might not be valid any more.

Reviewed-by: Kim

1 files changed, 4 insertions, 3 deletions

diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index ad22366d41..e24539bad0 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -1331,9 +1331,7 @@ bool QGL2PaintEngineEx::begin(QPaintDevice *pdev)
     qt_resolve_version_2_0_functions(d->ctx);
 #endif
 
-    if (!d->shaderManager)
-        d->shaderManager = new QGLEngineShaderManager(d->ctx);
-    d->shaderManager->setDirty();
+    d->shaderManager = new QGLEngineShaderManager(d->ctx);
 
     glViewport(0, 0, d->width, d->height);
 
@@ -1417,6 +1415,9 @@ bool QGL2PaintEngineEx::end()
 
     d->resetGLState();
 
+    delete d->shaderManager;
+    d->shaderManager = 0;
+
     return false;
 }