From 47f0c5506065e4cef7e2faa6c702f7bc243be88b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Trond=20Kjern=C3=A5sen?= <trond@trolltech.com>
Date: Wed, 9 Sep 2009 16:20:08 +0200
Subject: Fixed a bug in the GL1 engine when using a QBrush(Qt::NoBrush) as a
 pen.

This bug was exposed by a change in the QSvg module, and it
fixes the framebufferobject and pbuffers2 GL examples.

Reviewed-by: Kim
---
 src/opengl/qpaintengine_opengl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/opengl/qpaintengine_opengl.cpp b/src/opengl/qpaintengine_opengl.cpp
index 15cfcfc..6466741 100644
--- a/src/opengl/qpaintengine_opengl.cpp
+++ b/src/opengl/qpaintengine_opengl.cpp
@@ -2116,7 +2116,7 @@ void QOpenGLPaintEngine::updatePen(const QPen &pen)
     Qt::PenStyle pen_style = pen.style();
     d->pen_brush_style = pen.brush().style();
     d->cpen = pen;
-    d->has_pen = (pen_style != Qt::NoPen);
+    d->has_pen = (pen_style != Qt::NoPen) && (d->pen_brush_style != Qt::NoBrush);
     d->updateUseEmulation();
 
     if (pen.isCosmetic()) {
-- 
cgit v0.12