Use the new support for comparisons in QMetaType for QVariant

Remove the compare method in the QVariant::Handler struct. Rely
on the generic support provided by QMetaType instead.

[ChangeLog][Important Behavior Changes][QVariant] QVariant will now use builtin support in
QMetaType to compare its content. This implies a behavioral change
for some graphical types like QPixmap, QImage and QIcon that will
never compare equal in Qt 6 (as they do not have a comparison
operator).

Change-Id: I30a6e7116c89124d11ed9052537cecc23f78116e
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>

8 files changed, 4 insertions, 64 deletions

diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
index a41af75f72..040fb474e7 100644
--- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
+++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
@@ -187,7 +187,6 @@ private slots:
 
     void operator_eq_eq_data();
     void operator_eq_eq();
-    void operator_eq_eq_rhs();
 
     void typeName_data();
     void typeName();
@@ -1676,22 +1675,6 @@ void tst_QVariant::operator_eq_eq()
     QCOMPARE( left == right, equal );
 }
 
-void tst_QVariant::operator_eq_eq_rhs()
-{
-    QVariant v = 42;
-
-    QVERIFY(v == 42);
-    QVERIFY(42 == v);
-
-#if 0
-    /* This should _not_ compile */
-    QStringList list;
-    QDateTime dt;
-
-    QVERIFY(dt == list);
-#endif
-}
-
 void tst_QVariant::typeName_data()
 {
     QTest::addColumn<int>("type");
diff --git a/tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt b/tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt
index 93efaf2aeb..40671c920c 100644
--- a/tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt
+++ b/tests/auto/gui/kernel/qguivariant/test/CMakeLists.txt
@@ -14,17 +14,6 @@ qt_add_test(tst_qguivariant
 )
 
 # Resources:
-set(tst_qguivariant_resource_files
-    "black.png"
-    "black2.png"
-)
-
-qt_add_resource(tst_qguivariant "tst_qguivariant"
-    PREFIX
-        "/"
-    FILES
-        ${tst_qguivariant_resource_files}
-)
 set(qguivariant_resource_files
     "data"
 )
diff --git a/tests/auto/gui/kernel/qguivariant/test/black.png b/tests/auto/gui/kernel/qguivariant/test/black.png
deleted file mode 100644
index 6c94085ed5..0000000000
--- a/tests/auto/gui/kernel/qguivariant/test/black.png
+++ /dev/null
diff --git a/tests/auto/gui/kernel/qguivariant/test/black2.png b/tests/auto/gui/kernel/qguivariant/test/black2.png
deleted file mode 100644
index 6c94085ed5..0000000000
--- a/tests/auto/gui/kernel/qguivariant/test/black2.png
+++ /dev/null
diff --git a/tests/auto/gui/kernel/qguivariant/test/test.pro b/tests/auto/gui/kernel/qguivariant/test/test.pro
index 39e4b3b71f..e285001b07 100644
--- a/tests/auto/gui/kernel/qguivariant/test/test.pro
+++ b/tests/auto/gui/kernel/qguivariant/test/test.pro
@@ -1,7 +1,6 @@
 CONFIG += testcase
 TARGET = tst_qguivariant
 SOURCES  += tst_qguivariant.cpp
-RESOURCES = tst_qguivariant.qrc
 INCLUDEPATH += $$PWD/../../../../other/qvariant_common
 QT += testlib
 RESOURCES += qguivariant.qrc
diff --git a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
index 12998add71..8b0abd61cc 100644
--- a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
+++ b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
@@ -109,7 +109,6 @@ private slots:
 
     void guiVariantAtExit();
 
-    void iconEquality();
     void qt4QPolygonFDataStream();
 };
 
@@ -740,33 +739,6 @@ void tst_QGuiVariant::guiVariantAtExit()
     QVERIFY(true);
 }
 
-void tst_QGuiVariant::iconEquality()
-{
-    QIcon i;
-    QVariant a = i;
-    QVariant b = i;
-    QCOMPARE(a, b);
-
-    i = QIcon(":/black.png");
-    a = i;
-    QVERIFY(a != b);
-
-    b = a;
-    QCOMPARE(a, b);
-
-    i = QIcon(":/black2.png");
-    a = i;
-    QVERIFY(a != b);
-
-    b = i;
-    QCOMPARE(a, b);
-
-    // This is a "different" QIcon
-    // even if the contents are the same
-    b = QIcon(":/black2.png");
-    QVERIFY(a != b);
-}
-
 void tst_QGuiVariant::qt4QPolygonFDataStream()
 {
     qRegisterMetaTypeStreamOperators<QPolygonF>();
diff --git a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.qrc b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.qrc
deleted file mode 100644
index 15cfde5788..0000000000
--- a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.qrc
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/">
-<file>black.png</file>
-<file>black2.png</file>
-</qresource>
-</RCC>
diff --git a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
index f7b1cfec65..25a7989c95 100644
--- a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
+++ b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
@@ -1776,7 +1776,10 @@ void tst_QTreeWidget::setData()
                     QCOMPARE(qvariant_cast<QTreeWidgetItem*>(args.at(0)), item);
                     QCOMPARE(qvariant_cast<int>(args.at(1)), j);
                     item->setIcon(j, icon);
-                    QCOMPARE(itemChangedSpy.count(), 0);
+                    QCOMPARE(itemChangedSpy.count(), 1);
+                    args = itemChangedSpy.takeFirst();
+                    QCOMPARE(qvariant_cast<QTreeWidgetItem*>(args.at(0)), item);
+                    QCOMPARE(qvariant_cast<int>(args.at(1)), j);
 
                     const QString toolTip = QLatin1String("toolTip ") + iS;
                     item->setToolTip(j, toolTip);