AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge integration refs/builds/qtci/dev/1617691608

Browse Source
This commit is contained in:
Qt CI Bot 2021-04-06 11:49:28 +00:00
commit 29450dfa28
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/tools/qmargins.cpp
View File

@ -670,7 +670,7 @@ QDebug operator<<(QDebug dbg, const QMargins &m)
Returns a QMarginsF object that is formed by dividing the components of Returns a QMarginsF object that is formed by dividing the components of
the given \a lhs margins by the given \a rhs divisor. the given \a lhs margins by the given \a rhs divisor.
The divisor must be neither zero nor NaN. The divisor must not be either zero or NaN.
\sa QMarginsF::operator*=(), QMarginsF::operator/=() \sa QMarginsF::operator*=(), QMarginsF::operator/=()
*/ */

2
src/testlib/qtestcase.qdoc
View File

@ -123,7 +123,7 @@
\snippet code/src_qtestlib_qtestcase.cpp 2 \snippet code/src_qtestlib_qtestcase.cpp 2
When comparing floating-point types (\c float, \c double, and \c qfloat16), When comparing floating-point types (\c float, \c double, and \c qfloat16),
\l qFuzzyCompare() is used for finite values. If qFuzzyIsNull() is true for \l {qFuzzyCompare()} is used for finite values. If \l {qFuzzyIsNull()} is true for
both values, they are also considered equal. Infinities match if they have both values, they are also considered equal. Infinities match if they have
the same sign, and any NaN as actual value matches with any NaN as expected the same sign, and any NaN as actual value matches with any NaN as expected
value (even though NaN != NaN, even when they're identical). value (even though NaN != NaN, even when they're identical).