Merge integration refs/builds/qtci/dev/1617691608

src/corelib/tools/qmargins.cpp

@@ -670,7 +670,7 @@ QDebug operator<<(QDebug dbg, const QMargins &m)
     Returns a QMarginsF object that is formed by dividing the components of
     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/=()
 */

src/testlib/qtestcase.qdoc

@@ -123,7 +123,7 @@
    \snippet code/src_qtestlib_qtestcase.cpp 2
 
    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
    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).