Prevented infinite recursion in GL graphics system.

If creating a QGLWidget triggers the creation of a QPixmap then we might
end up in an infinite recursion due to QPixmap trying to access
qt_gl_share_widget(). This can happen via setWindowIcon for example.
Adding an initializing flag to QGLGlobalShareWidget and preventing
QGLFramebufferObject::hasOpenGLFramebufferObjects() and
::hasOpenGLFramebufferBlit() from creating a QGLWidget every time they
are called with no active GL context.

Reviewed-by: Trond

1 files changed, 5 insertions, 2 deletions

diff --git a/src/opengl/qpixmapdata_gl.cpp b/src/opengl/qpixmapdata_gl.cpp
index 5e73ef5..f745aae 100644
--- a/src/opengl/qpixmapdata_gl.cpp
+++ b/src/opengl/qpixmapdata_gl.cpp
@@ -114,8 +114,11 @@ QGLPixmapData::~QGLPixmapData()
     QGLWidget *shareWidget = qt_gl_share_widget();
     if (!shareWidget)
         return;
-    QGLShareContextScope ctx(shareWidget->context());
-    glDeleteTextures(1, &m_textureId);
+
+    if (m_textureId) {
+        QGLShareContextScope ctx(shareWidget->context());
+        glDeleteTextures(1, &m_textureId);
+    }
 }
 
 bool QGLPixmapData::isValid() const