summaryrefslogtreecommitdiffstats
path: root/src/opengl
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2009-09-14 09:15:51 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2009-09-14 09:15:51 (GMT)
commit24334c206e0611c2a8c5ef7265b96465c9459939 (patch)
treee25c63bcb35d4247adeb1bced041d668e7153431 /src/opengl
parent3aa5fec77b2e1edbcbd1d7735389725076f91cbf (diff)
downloadQt-24334c206e0611c2a8c5ef7265b96465c9459939.zip
Qt-24334c206e0611c2a8c5ef7265b96465c9459939.tar.gz
Qt-24334c206e0611c2a8c5ef7265b96465c9459939.tar.bz2
Fixed crash in gl when stroking with a Qt::NoBrush pen
Reviewed-by: Samuel
Diffstat (limited to 'src/opengl')
-rw-r--r--src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index e32bbbd..adde89c 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -1052,7 +1052,9 @@ void QGL2PaintEngineEx::stroke(const QVectorPath &path, const QPen &pen)
{
Q_D(QGL2PaintEngineEx);
- if (pen.style() == Qt::NoPen)
+ Qt::PenStyle penStyle = qpen_style(pen);
+ const QBrush &penBrush = qpen_brush(pen);
+ if (penStyle == Qt::NoPen || qbrush_style(penBrush) == Qt::NoBrush)
return;
ensureActive();