diff options
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/painting/qpainter.cpp | 8 | ||||
| -rw-r--r-- | src/gui/painting/qpen.cpp | 4 |
2 files changed, 1 insertions, 11 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 09a4563..4c13d3e 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -3890,14 +3890,6 @@ void QPainter::setBrush(const QBrush &brush) return; } - Qt::BrushStyle currentStyle = d->state->brush.style(); - if (currentStyle == brush.style()) { - if (currentStyle == Qt::NoBrush - || (currentStyle == Qt::SolidPattern - && d->state->brush.color() == brush.color())) - return; - } - d->state->brush = brush; d->state->dirtyFlags |= QPaintEngine::DirtyBrush; } diff --git a/src/gui/painting/qpen.cpp b/src/gui/painting/qpen.cpp index 1ddadf2..a57450d 100644 --- a/src/gui/painting/qpen.cpp +++ b/src/gui/painting/qpen.cpp @@ -845,9 +845,7 @@ bool QPen::operator==(const QPen &p) const || (qFuzzyCompare(pdd->dashOffset, dd->dashOffset) && pdd->dashPattern == dd->dashPattern)) && p.d->brush == d->brush - && pdd->cosmetic == dd->cosmetic) - || ((p.d->style == Qt::NoPen || p.d->brush.style() == Qt::NoBrush) - && (d->style == Qt::NoPen || d->brush.style() == Qt::NoBrush)); + && pdd->cosmetic == dd->cosmetic); } |