diff options
author | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-06 09:13:27 (GMT) |
---|---|---|
committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-11-06 13:07:39 (GMT) |
commit | 3ad67135d3f848241469752b91cc12e5c4fcc81b (patch) | |
tree | da412bc74886ad66e4fe40346129ca49c5b09be0 | |
parent | 74e554cd98add74070d9b6d4630c51bbc5d3620e (diff) | |
download | Qt-3ad67135d3f848241469752b91cc12e5c4fcc81b.zip Qt-3ad67135d3f848241469752b91cc12e5c4fcc81b.tar.gz Qt-3ad67135d3f848241469752b91cc12e5c4fcc81b.tar.bz2 |
Revert micro optimization where NoPen == NoBrush as SVG relies on this
Reviewed-by: Samuel
-rw-r--r-- | src/gui/painting/qpen.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
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); } |