From 136f9766f6629a3e82609cf51346e4811bcc47ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <sroedal@trolltech.com>
Date: Fri, 27 Mar 2009 16:53:22 +0100
Subject: Crash in OpenGL paint engine when brush style is Qt::NoBrush.

Check for Qt::NoBrush and return early in the composite() function.

Task-number: 249628
Reviewed-by: Trond
---
 src/opengl/qpaintengine_opengl.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/opengl')

diff --git a/src/opengl/qpaintengine_opengl.cpp b/src/opengl/qpaintengine_opengl.cpp
index f332a50a73..976a0218a1 100644
--- a/src/opengl/qpaintengine_opengl.cpp
+++ b/src/opengl/qpaintengine_opengl.cpp
@@ -5328,6 +5328,9 @@ void QOpenGLPaintEnginePrivate::composite(GLuint primitive, const q_vertexType *
     Q_Q(QOpenGLPaintEngine);
     QGL_FUNC_CONTEXT;
 
+    if (current_style == Qt::NoBrush)
+        return;
+
     DEBUG_ONCE qDebug() << "QOpenGLPaintEnginePrivate: Using compositing program: fragment_brush ="
                         << fragment_brush << ", fragment_composition_mode =" << fragment_composition_mode;
 
-- 
cgit v1.2.3