diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-13 19:45:20 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-03-13 19:45:20 +0000 |
| commit | 77e71dac1607232160006579420df8b603118462 (patch) | |
| tree | 8fe71cc79127465f63944eb0dd48a00478546f57 /src/gui/painting | |
| parent | 70e772079f4943822cc469ef83fb9c43afc36514 (diff) | |
| parent | d51c3ecf8ef6e28557c66745f50a223cc5b1ce54 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.8' into 5.9" into refs/staging/5.9
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qpainter.cpp | 2 | ||||
| -rw-r--r-- | src/gui/painting/qtransform.h | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 083e68fcdb..b186182c34 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -5968,7 +5968,7 @@ void QPainter::drawText(const QRect &r, int flags, const QString &str, QRect *br \snippet code/src_gui_painting_qpainter.cpp 17 \endtable - The \a boundingRect (if not null) is set to the what the bounding rectangle + The \a boundingRect (if not null) is set to what the bounding rectangle should be in order to enclose the whole text. For example, in the following image, the dotted line represents \a boundingRect as calculated by the function, and the dashed line represents \a rectangle: diff --git a/src/gui/painting/qtransform.h b/src/gui/painting/qtransform.h index 2aea19eca0..5ca1d46982 100644 --- a/src/gui/painting/qtransform.h +++ b/src/gui/painting/qtransform.h @@ -291,6 +291,10 @@ inline qreal QTransform::dy() const return affine._dy; } +QT_WARNING_PUSH +QT_WARNING_DISABLE_CLANG("-Wfloat-equal") +QT_WARNING_DISABLE_GCC("-Wfloat-equal") + inline QTransform &QTransform::operator*=(qreal num) { if (num == 1.) @@ -348,6 +352,8 @@ inline QTransform &QTransform::operator-=(qreal num) return *this; } +QT_WARNING_POP + inline bool qFuzzyCompare(const QTransform& t1, const QTransform& t2) { return qFuzzyCompare(t1.m11(), t2.m11()) |