diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-05 23:00:12 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-05 23:00:12 (GMT) |
| commit | 4027b59d8ea97821301db7c66607fb8fe1ef295b (patch) | |
| tree | de62b8b73d4ba0b91b4ed88fd9a80d04c8d23144 /src/corelib/tools | |
| parent | 9ec03f667410ab672c855fad8061dbb5f7b20711 (diff) | |
| parent | 6ac4bc5cb7ac7500b39ea6828fdf76e95a2c2f0b (diff) | |
| download | Qt-4027b59d8ea97821301db7c66607fb8fe1ef295b.zip Qt-4027b59d8ea97821301db7c66607fb8fe1ef295b.tar.gz Qt-4027b59d8ea97821301db7c66607fb8fe1ef295b.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qpoint.cpp | 6 | ||||
| -rw-r--r-- | src/corelib/tools/qsize.cpp | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/corelib/tools/qpoint.cpp b/src/corelib/tools/qpoint.cpp index 66f06e9..c297709 100644 --- a/src/corelib/tools/qpoint.cpp +++ b/src/corelib/tools/qpoint.cpp @@ -438,8 +438,12 @@ QDebug operator<<(QDebug d, const QPointF &p) /*! \fn bool QPointF::isNull() const - Returns true if both the x and y coordinates are set to 0.0, + Returns true if both the x and y coordinates are set to +0.0; otherwise returns false. + + \note Since this function treats +0.0 and -0.0 differently, points + with zero-valued coordinates where either or both values have a + negative sign are not defined to be null points. */ diff --git a/src/corelib/tools/qsize.cpp b/src/corelib/tools/qsize.cpp index 20ac344..12287ab 100644 --- a/src/corelib/tools/qsize.cpp +++ b/src/corelib/tools/qsize.cpp @@ -492,9 +492,13 @@ QDebug operator<<(QDebug dbg, const QSize &s) { /*! \fn bool QSizeF::isNull() const - Returns true if both the width and height is 0; otherwise returns + Returns true if both the width and height are +0.0; otherwise returns false. + \note Since this function treats +0.0 and -0.0 differently, sizes with + zero width and height where either or both values have a negative + sign are not defined to be null sizes. + \sa isValid(), isEmpty() */ |