diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-01-28 16:13:16 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-01-28 16:13:16 (GMT) |
| commit | b383ff766764f4d0d9644ca06bfb049d62bdcf2f (patch) | |
| tree | 3d8fbe861d3618bd37b33e25a697a6bfa6614e46 /src/gui/painting/qpaintengine_raster_p.h | |
| parent | 0585997b7dbe25ece9f60684171c16206d10d65f (diff) | |
| parent | 7c2000060bbc152ae32594f3d4dd60bd3351dab0 (diff) | |
| download | Qt-b383ff766764f4d0d9644ca06bfb049d62bdcf2f.zip Qt-b383ff766764f4d0d9644ca06bfb049d62bdcf2f.tar.gz Qt-b383ff766764f4d0d9644ca06bfb049d62bdcf2f.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
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 b937f66..a1c73cc 100644 --- a/src/gui/painting/qpaintengine_raster_p.h +++ b/src/gui/painting/qpaintengine_raster_p.h @@ -264,13 +264,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); } |