diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-07-05 15:37:50 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-07-05 15:37:50 +0200 |
| commit | deee7b7eced5b240e3161d655319dbaaf2f8965c (patch) | |
| tree | 4ad6db0e97482c24f02f111cbfeec224535feb73 /src/corelib/tools/qrect.cpp | |
| parent | bcd4b14026094d0077ad1069054676cc6da96251 (diff) | |
| parent | 6ad08b9cad4efefc72e64deaa0b720a3aab0fa54 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.qmake.conf
qmake/generators/makefile.cpp
Change-Id: Ifb2633a69d0bf8cdf12d799c6259beefc279c49e
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 d622f92530c..cd20102a2bc 100644 --- a/src/corelib/tools/qrect.cpp +++ b/src/corelib/tools/qrect.cpp @@ -1194,7 +1194,7 @@ bool QRect::intersects(const QRect &r) const noexcept \fn QRect operator-(const QRect &lhs, const QMargins &rhs) \relates QRect - Returns the \a lhs rectangle shrunken by the \a rhs margins. + Returns the \a lhs rectangle shrunk by the \a rhs margins. \since 5.3 */ @@ -2417,7 +2417,7 @@ QRect QRectF::toAlignedRect() const noexcept \relates QRectF \since 5.3 - Returns the \a lhs rectangle grown by the \a rhs margins. + Returns the \a lhs rectangle shrunk by the \a rhs margins. */ /*! |