diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-02-10 10:04:29 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-02-10 10:04:29 (GMT) |
| commit | 7651a4bacf8f34f3700853f147093a073f0472ab (patch) | |
| tree | d47559d6b0c6fc78b091095bbd8b8350c880e91b /src/gui/painting/qpaintengine_raster_p.h | |
| parent | 175605f736ce76a9c0296aa607a6a82ea6675542 (diff) | |
| parent | f57a2756ebfb48c2fad94c0c319fa181d2af4dfd (diff) | |
| download | Qt-7651a4bacf8f34f3700853f147093a073f0472ab.zip Qt-7651a4bacf8f34f3700853f147093a073f0472ab.tar.gz Qt-7651a4bacf8f34f3700853f147093a073f0472ab.tar.bz2 | |
Merge remote branch 'remotes/qt/4.6' into lighthouse
Conflicts:
configure
tests/auto/qwidget/tst_qwidget.cpp
Diffstat (limited to 'src/gui/painting/qpaintengine_raster_p.h')
| -rw-r--r-- | src/gui/painting/qpaintengine_raster_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/painting/qpaintengine_raster_p.h b/src/gui/painting/qpaintengine_raster_p.h index 8c8cc6f..6148b52 100644 --- a/src/gui/painting/qpaintengine_raster_p.h +++ b/src/gui/painting/qpaintengine_raster_p.h @@ -266,13 +266,13 @@ private: #endif // Q_OS_SYMBIAN && QT_NO_FREETYPE inline void ensureBrush(const QBrush &brush) { - if (!qbrush_fast_equals(state()->lastBrush, brush) || state()->fillFlags) + if (!qbrush_fast_equals(state()->lastBrush, brush) || (brush.style() != Qt::NoBrush && state()->fillFlags)) updateBrush(brush); } inline void ensureBrush() { ensureBrush(state()->brush); } inline void ensurePen(const QPen &pen) { - if (!qpen_fast_equals(state()->lastPen, pen) || state()->strokeFlags) + if (!qpen_fast_equals(state()->lastPen, pen) || (pen.style() != Qt::NoPen && state()->strokeFlags)) updatePen(pen); } inline void ensurePen() { ensurePen(state()->pen); } |