diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-06-23 09:01:15 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-06-23 10:41:30 (GMT) |
| commit | a8a0c956f747cd09ca04cfe8b33d09a8476c6453 (patch) | |
| tree | 5eaefe921a5f45f290d5dcb701eb71f142f68f25 /src/corelib/tools/qrect.h | |
| parent | aacf96f414651c516b11518d9a921d9853d09e69 (diff) | |
| download | Qt-a8a0c956f747cd09ca04cfe8b33d09a8476c6453.zip Qt-a8a0c956f747cd09ca04cfe8b33d09a8476c6453.tar.gz Qt-a8a0c956f747cd09ca04cfe8b33d09a8476c6453.tar.bz2 | |
Regression against 4.4 in QRectF::operator|.
In 4.4 QRectF handled flat rectangles in the same fashion as QRect does,
but that changed with Lars' and Jo's optmizations done in the falcon
branch. The difference is that the optimized version only checks whether
the width or height is 0, whereas in 4.4 both had to be 0 (isNull()) before
we bailed out.
This regression also introduced a regression in
QGraphicsItem::childrenBoundingRect().
Auto-test included.
Task-number: 254995
Reviewed-by: Lars
Diffstat (limited to 'src/corelib/tools/qrect.h')
| -rw-r--r-- | src/corelib/tools/qrect.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qrect.h b/src/corelib/tools/qrect.h index 0740fe5..efdc24d 100644 --- a/src/corelib/tools/qrect.h +++ b/src/corelib/tools/qrect.h @@ -653,7 +653,7 @@ inline QRectF::QRectF(const QRect &r) } inline bool QRectF::isNull() const -{ return qIsNull(w) && qIsNull(h); } +{ return w == 0. && h == 0.; } inline bool QRectF::isEmpty() const { return w <= 0. || h <= 0.; } |