diff options
| author | Trond Kjernåsen <trond@trolltech.com> | 2009-09-09 14:20:08 (GMT) |
|---|---|---|
| committer | Trond Kjernåsen <trond@trolltech.com> | 2009-09-09 14:23:29 (GMT) |
| commit | 47f0c5506065e4cef7e2faa6c702f7bc243be88b (patch) | |
| tree | 4b4f494db5b600ea26734501b2e153aa4f5f6cdc /src/opengl | |
| parent | fd680f4c636d2084094efa064811d51d8f6f65af (diff) | |
| download | Qt-47f0c5506065e4cef7e2faa6c702f7bc243be88b.zip Qt-47f0c5506065e4cef7e2faa6c702f7bc243be88b.tar.gz Qt-47f0c5506065e4cef7e2faa6c702f7bc243be88b.tar.bz2 | |
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
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qpaintengine_opengl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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()) { |