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, 2 insertions, 4 deletions

diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp
index 7f229e2..eacf5bb 100644
--- a/src/opengl/qglframebufferobject.cpp
+++ b/src/opengl/qglframebufferobject.cpp
@@ -935,8 +935,7 @@ QPaintEngine *QGLFramebufferObject::paintEngine() const
 */
 bool QGLFramebufferObject::hasOpenGLFramebufferObjects()
 {
-    if (!QGLContext::currentContext())
-        QGLWidget dmy; // needed to detect and init the QGLExtensions object
+    QGLExtensions::init();
     return (QGLExtensions::glExtensions & QGLExtensions::FramebufferObject);
 }
 
@@ -1098,8 +1097,7 @@ bool QGLFramebufferObject::isBound() const
 */
 bool QGLFramebufferObject::hasOpenGLFramebufferBlit()
 {
-    if (!QGLContext::currentContext())
-        QGLWidget dmy; // needed to detect and init the QGLExtensions object
+    QGLExtensions::init();
     return (QGLExtensions::glExtensions & QGLExtensions::FramebufferBlit);
 }