diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:10:15 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:10:15 +0100 |
commit | 3b5c0bc0780f1749fed7c07bd8b691400a0282b7 (patch) | |
tree | 1022f5553ad5a0aca9b5f3b49ca38a01c2329d20 /src/corelib/tools/qrect.cpp | |
parent | c79918733a194ebbe5a2fe1617c884659f3e4b9f (diff) | |
parent | 21f1738a94fc8544ece04b3b1ee03a11986fe59b (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/gui/image/qjpeghandler.cpp
Change-Id: I9db3acea7d5c82f5da679c8eaeb29431136665f0
Diffstat (limited to 'src/corelib/tools/qrect.cpp')
-rw-r--r-- | src/corelib/tools/qrect.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qrect.cpp b/src/corelib/tools/qrect.cpp index 1b3a28839c..35c7d1cd3c 100644 --- a/src/corelib/tools/qrect.cpp +++ b/src/corelib/tools/qrect.cpp @@ -1201,7 +1201,7 @@ bool QRect::intersects(const QRect &r) const */ /*! - \fn QRect QRect::operator+=(const QMargins &margins) const + \fn QRect QRect::operator+=(const QMargins &margins) Adds the \a margins to the rectangle, growing it. @@ -1221,7 +1221,7 @@ bool QRect::intersects(const QRect &r) const */ /*! - \fn QRect QRect::operator -=(const QMargins &margins) const + \fn QRect QRect::operator -=(const QMargins &margins) Returns a rectangle shrunk by the \a margins. |