From 50c96c17b6c87d48418336dc124a6de3f1f1958b Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 8 Jun 2020 12:55:43 +0200 Subject: 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 --- tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'tests/auto/widgets/itemviews/qtreewidget') 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(args.at(0)), item); QCOMPARE(qvariant_cast(args.at(1)), j); item->setIcon(j, icon); - QCOMPARE(itemChangedSpy.count(), 0); + QCOMPARE(itemChangedSpy.count(), 1); + args = itemChangedSpy.takeFirst(); + QCOMPARE(qvariant_cast(args.at(0)), item); + QCOMPARE(qvariant_cast(args.at(1)), j); const QString toolTip = QLatin1String("toolTip ") + iS; item->setToolTip(j, toolTip); -- cgit v1.2.3