Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
	src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp

2 files changed, 3 insertions, 3 deletions

diff --git a/src/openvg/qwindowsurface_vgegl.cpp b/src/openvg/qwindowsurface_vgegl.cpp
index f7961b4..e16eeb3 100644
--- a/src/openvg/qwindowsurface_vgegl.cpp
+++ b/src/openvg/qwindowsurface_vgegl.cpp
@@ -686,6 +686,8 @@ QEglContext *QVGEGLWindowSurfaceDirect::ensureContext(QWidget *widget)
 #endif
         EGLSurface surface = context->createSurface(widget, &surfaceProps);
         if (surface == EGL_NO_SURFACE) {
+            qt_vg_destroy_paint_engine(engine);
+            engine = 0;
             qt_vg_destroy_context(context, QInternal::Widget);
             context = 0;
             return 0;
diff --git a/src/openvg/qwindowsurface_vgegl_p.h b/src/openvg/qwindowsurface_vgegl_p.h
index 231c548..2226e28 100644
--- a/src/openvg/qwindowsurface_vgegl_p.h
+++ b/src/openvg/qwindowsurface_vgegl_p.h
@@ -80,10 +80,8 @@ public:
     virtual bool supportsStaticContents() const { return false; }
     virtual bool scroll(QWidget *, const QRegion&, int, int) { return false; }
 
-private:
-    QVGPaintEngine *engine;
-
 protected:
+    QVGPaintEngine *engine;
     QWindowSurface *winSurface;
 
     void destroyPaintEngine();