QMargins(F): use comparison helper macros

Also explicitly add QMarginsF vs QMargins comparison. Previously such
comparison was implicitly converting QMargins to QMarginsF, and doing the
fuzzy comparison. We have to keep the old behavior to avoid
breaking user code, so use fuzzy comparison in the new operators
as well.

Task-number: QTBUG-120308
Change-Id: Ic82f64078cd991859b851f24aa7017ef0b91a4e1
Reviewed-by: Tatiana Borisova <tatiana.borisova@qt.io>

1 files changed, 8 insertions, 0 deletions

diff --git a/tests/auto/corelib/tools/qmargins/tst_qmargins.cpp b/tests/auto/corelib/tools/qmargins/tst_qmargins.cpp
index a16ec90bdf..a7d50bf338 100644
--- a/tests/auto/corelib/tools/qmargins/tst_qmargins.cpp
+++ b/tests/auto/corelib/tools/qmargins/tst_qmargins.cpp
@@ -44,6 +44,7 @@ class tst_QMargins : public QObject
 {
     Q_OBJECT
 private slots:
+    void comparisonCompiles();
     void comparison_data();
     void comparison();
 
@@ -71,6 +72,13 @@ private slots:
     void toMarginsF();
 };
 
+void tst_QMargins::comparisonCompiles()
+{
+    QTestPrivate::testEqualityOperatorsCompile<QMargins>();
+    QTestPrivate::testEqualityOperatorsCompile<QMarginsF>();
+    QTestPrivate::testEqualityOperatorsCompile<QMarginsF, QMargins>();
+}
+
 void tst_QMargins::comparison_data()
 {
     QTest::addColumn<QMarginsF>("lhs");