From f4093d02ff387956de4cd2662cc2d4e0e6d3fda4 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Thu, 30 Jul 2020 13:21:37 +0200 Subject: [PATCH] Fix "rectange" typos in qtbase Pick-to: 5.15 Change-Id: If064fae5eaaeb2e53e3dd05cb9dc1cdf49ad1f04 Reviewed-by: Rainer Keller --- src/corelib/tools/qrect.cpp | 4 ++-- src/gui/doc/src/coordsys.qdoc | 2 +- src/gui/painting/qcssutil.cpp | 2 +- src/gui/painting/qregion.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/corelib/tools/qrect.cpp b/src/corelib/tools/qrect.cpp index 4aa9897b5d3..2bdf1094daf 100644 --- a/src/corelib/tools/qrect.cpp +++ b/src/corelib/tools/qrect.cpp @@ -81,7 +81,7 @@ QT_BEGIN_NAMESPACE position, and the translated() function returns a translated copy of this rectangle. - The size() function returns the rectange's dimensions as a + The size() function returns the rectangle's dimensions as a QSize. The dimensions can also be retrieved separately using the width() and height() functions. To manipulate the dimensions use the setSize(), setWidth() or setHeight() functions. Alternatively, @@ -1326,7 +1326,7 @@ QDebug operator<<(QDebug dbg, const QRect &r) current position, and the translated() function returns a translated copy of this rectangle. - The size() function returns the rectange's dimensions as a + The size() function returns the rectangle's dimensions as a QSizeF. The dimensions can also be retrieved separately using the width() and height() functions. To manipulate the dimensions use the setSize(), setWidth() or setHeight() functions. Alternatively, diff --git a/src/gui/doc/src/coordsys.qdoc b/src/gui/doc/src/coordsys.qdoc index 1018b2122bc..ed413b500fd 100644 --- a/src/gui/doc/src/coordsys.qdoc +++ b/src/gui/doc/src/coordsys.qdoc @@ -434,7 +434,7 @@ \li A vectorial specification of a 2D shape. Painter paths are the ultimate painting primitive, in the sense that any shape - (rectange, ellipse, spline) or combination of shapes can be + (rectangle, ellipse, spline) or combination of shapes can be expressed as a path. A path specifies both an outline and an area. \row \li QRegion diff --git a/src/gui/painting/qcssutil.cpp b/src/gui/painting/qcssutil.cpp index 2d514e14e08..42e14b3d84a 100644 --- a/src/gui/painting/qcssutil.cpp +++ b/src/gui/painting/qcssutil.cpp @@ -328,7 +328,7 @@ void qNormalizeRadii(const QRect &br, const QSize *radii, *trr = *brr = QSize(0, 0); } -// Determines if Edge e1 draws over Edge e2. Depending on this trapezoids or rectanges are drawn +// Determines if Edge e1 draws over Edge e2. Depending on this trapezoids or rectangles are drawn static bool paintsOver(const QCss::BorderStyle *styles, const QBrush *colors, QCss::Edge e1, QCss::Edge e2) { QCss::BorderStyle s1 = styles[e1]; diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp index 5685d34ea7a..d18629026aa 100644 --- a/src/gui/painting/qregion.cpp +++ b/src/gui/painting/qregion.cpp @@ -134,7 +134,7 @@ QT_BEGIN_NAMESPACE \fn QRegion::QRegion(const QRect &r, RegionType t) \overload - Create a region based on the rectange \a r with region type \a t. + Create a region based on the rectangle \a r with region type \a t. If the rectangle is invalid a null region will be created.