equal
deleted
inserted
replaced
262 #if defined(Q_OS_SYMBIAN) && defined(QT_NO_FREETYPE) |
262 #if defined(Q_OS_SYMBIAN) && defined(QT_NO_FREETYPE) |
263 void drawGlyphsS60(const QPointF &p, const QTextItemInt &ti); |
263 void drawGlyphsS60(const QPointF &p, const QTextItemInt &ti); |
264 #endif // Q_OS_SYMBIAN && QT_NO_FREETYPE |
264 #endif // Q_OS_SYMBIAN && QT_NO_FREETYPE |
265 |
265 |
266 inline void ensureBrush(const QBrush &brush) { |
266 inline void ensureBrush(const QBrush &brush) { |
267 if (!qbrush_fast_equals(state()->lastBrush, brush) || state()->fillFlags) |
267 if (!qbrush_fast_equals(state()->lastBrush, brush) || (brush.style() != Qt::NoBrush && state()->fillFlags)) |
268 updateBrush(brush); |
268 updateBrush(brush); |
269 } |
269 } |
270 inline void ensureBrush() { ensureBrush(state()->brush); } |
270 inline void ensureBrush() { ensureBrush(state()->brush); } |
271 |
271 |
272 inline void ensurePen(const QPen &pen) { |
272 inline void ensurePen(const QPen &pen) { |
273 if (!qpen_fast_equals(state()->lastPen, pen) || state()->strokeFlags) |
273 if (!qpen_fast_equals(state()->lastPen, pen) || (pen.style() != Qt::NoPen && state()->strokeFlags)) |
274 updatePen(pen); |
274 updatePen(pen); |
275 } |
275 } |
276 inline void ensurePen() { ensurePen(state()->pen); } |
276 inline void ensurePen() { ensurePen(state()->pen); } |
277 |
277 |
278 void updateOutlineMapper(); |
278 void updateOutlineMapper(); |