Deprecate QVariant::Type

It's been obsolete for a long time already. Make sure
the compiler now warns about it and remove all remaining
uses in qtbase.

Change-Id: I0ff80311184dba52d2ba5f4e2fabe0d47fdc59d7
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 3 insertions, 3 deletions

diff --git a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
index 25a7989c95..2a02afb36b 100644
--- a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
+++ b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
@@ -1938,13 +1938,13 @@ void tst_QTreeWidget::setData()
         // ### add more data types here
 
         item->setData(0, Qt::DisplayRole, 5);
-        QCOMPARE(item->data(0, Qt::DisplayRole).type(), QVariant::Int);
+        QCOMPARE(item->data(0, Qt::DisplayRole).userType(), QMetaType::Int);
 
         item->setData(0, Qt::DisplayRole, "test");
-        QCOMPARE(item->data(0, Qt::DisplayRole).type(), QVariant::String);
+        QCOMPARE(item->data(0, Qt::DisplayRole).userType(), QMetaType::QString);
 
         item->setData(0, Qt::DisplayRole, 0.4);
-        QCOMPARE(item->data(0, Qt::DisplayRole).type(), QVariant::Double);
+        QCOMPARE(item->data(0, Qt::DisplayRole).userType(), QMetaType::Double);
 
         delete item;
     }