diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-09-10 09:11:00 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-09-10 12:12:46 +0200 |
| commit | 683e144efbd91163795dc582aedc210c7d78de4d (patch) | |
| tree | 2211fffdbaad8bad9569f63e017e7caf85eec2b6 /src/corelib | |
| parent | b66357e3ebf3e3dbda04f880e87184e247882843 (diff) | |
| parent | 1f1e2aa57b480f0b227e11d0cff0b3cfcffb1f39 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
mkspecs/common/macx.conf
Change-Id: I8576493b417912fa5e5501bc2c1b935d186ac209
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qrect.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/tools/qrect.cpp b/src/corelib/tools/qrect.cpp index 40d6c8b7c3..ad1885e8ce 100644 --- a/src/corelib/tools/qrect.cpp +++ b/src/corelib/tools/qrect.cpp @@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE The QRect class provides a collection of functions that return the various rectangle coordinates, and enable manipulation of - these. QRect also provide functions to move the rectangle relative + these. QRect also provides functions to move the rectangle relative to the various coordinates. In addition there is a moveTo() function that moves the rectangle, leaving its top left corner at the given coordinates. Alternatively, the translate() function @@ -155,7 +155,7 @@ QT_BEGIN_NAMESPACE The QRect class provides a collection of functions that return the various rectangle coordinates, and enable manipulation of - these. QRect also provide functions to move the rectangle relative + these. QRect also provides functions to move the rectangle relative to the various coordinates. For example the left(), setLeft() and moveLeft() functions as an @@ -1335,7 +1335,7 @@ QDebug operator<<(QDebug dbg, const QRect &r) The QRectF class provides a collection of functions that return the various rectangle coordinates, and enable manipulation of - these. QRectF also provide functions to move the rectangle + these. QRectF also provides functions to move the rectangle relative to the various coordinates. In addition there is a moveTo() function that moves the rectangle, leaving its top left corner at the given coordinates. Alternatively, the translate() @@ -1418,7 +1418,7 @@ QDebug operator<<(QDebug dbg, const QRect &r) The QRectF class provides a collection of functions that return the various rectangle coordinates, and enable manipulation of - these. QRectF also provide functions to move the rectangle + these. QRectF also provides functions to move the rectangle relative to the various coordinates. For example: the bottom(), setBottom() and moveBottom() functions: |