diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-01 15:36:05 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-01 15:36:05 (GMT) |
| commit | 7e8d20de90af2e5ea199b6a92830cc223cea777b (patch) | |
| tree | 89364f787fad44c2fdea1de6358140c568a82e7a /src/gui/painting/qpaintengine_raster_p.h | |
| parent | f3cf5dd98e321980984288a1768f3375a8349800 (diff) | |
| parent | afe0f17eb5974adbedd1bc1f2fcd98459d92df47 (diff) | |
| download | Qt-7e8d20de90af2e5ea199b6a92830cc223cea777b.zip Qt-7e8d20de90af2e5ea199b6a92830cc223cea777b.tar.gz Qt-7e8d20de90af2e5ea199b6a92830cc223cea777b.tar.bz2 | |
Merge branch '4.6' into qstatictext-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 e441a6b..5e5d9b8 100644 --- a/src/gui/painting/qpaintengine_raster_p.h +++ b/src/gui/painting/qpaintengine_raster_p.h @@ -267,13 +267,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); } |