diff -r 3b1da2848fc7 -r d3bac044e0f0 src/gui/painting/qpaintengine_raster_p.h
--- a/src/gui/painting/qpaintengine_raster_p.h	Fri Feb 19 23:40:16 2010 +0200
+++ b/src/gui/painting/qpaintengine_raster_p.h	Fri Mar 12 15:46:37 2010 +0200
@@ -264,13 +264,13 @@
 #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); }