diff options
author | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-06 09:13:27 (GMT) |
---|---|---|
committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-06 09:13:27 (GMT) |
commit | 1e77901a50858cf9243e6d813303d8ce013e4d31 (patch) | |
tree | 151a892bde56bd4bca5644d556e76f9f8aa63a78 | |
parent | 3c0b6de86ce044ce6f3f4a445d1de90b4e7bb1d9 (diff) | |
download | Qt-1e77901a50858cf9243e6d813303d8ce013e4d31.zip Qt-1e77901a50858cf9243e6d813303d8ce013e4d31.tar.gz Qt-1e77901a50858cf9243e6d813303d8ce013e4d31.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); } |