diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-24 19:57:17 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-24 20:01:42 +0100 |
| commit | de49839df8abfba1f3ed3c36ef3177e4a9d6ef00 (patch) | |
| tree | 71e777ca1e33c58edd9149821e970495ef4b75b2 /src/corelib/doc | |
| parent | e6234535929c67e7fbfa1ad7ce88f37df0b68d45 (diff) | |
| parent | 4d3781b640e8fb0a04e96b2d05199247556b8d86 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
mkspecs/features/moc.prf
Change-Id: Ia71c8e3b3185f7c999bf226d0675051b10b8740b
Diffstat (limited to 'src/corelib/doc')
| -rw-r--r-- | src/corelib/doc/snippets/code/src_corelib_tools_qrect.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qrect.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qrect.cpp index 1c7f9d4b54..4bdaa4d657 100644 --- a/src/corelib/doc/snippets/code/src_corelib_tools_qrect.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_tools_qrect.cpp @@ -55,6 +55,6 @@ QRect r2(QPoint(100, 200), QSize(11, 16)); //! [1] -QRectF r1(100, 200, 11, 16); -QRectF r2(QPoint(100, 200), QSize(11, 16)); +QRectF r1(100.0, 200.1, 11.2, 16.3); +QRectF r2(QPointF(100.0, 200.1), QSizeF(11.2, 16.3)); //! [1] |