Replace QVariant::type with QVariant::userType

as type is going to be deprecated.

This change was done automatically with the help of clazy.
In addition, ColumnRoleMetadata was changed to take an int instead
of a QVariant::Type

Change-Id: Ibc02d7b52e7d931a56c19fdebc4788b5e6df2a39
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 2 insertions, 2 deletions

diff --git a/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp b/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp
index 95f554776f..d6e85f973f 100644
--- a/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp
+++ b/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp
@@ -1081,7 +1081,7 @@ void tst_QJSValue::toVariant()
 
         // We can't roundtrip a QRegExp this way, as toVariant() has no information on whether we
         // want QRegExp or QRegularExpression. It will always create a QRegularExpression.
-        QCOMPARE(var.type(), QMetaType::QRegularExpression);
+        QCOMPARE(var.userType(), QMetaType::QRegularExpression);
         QRegularExpression result = var.toRegularExpression();
         QCOMPARE(result.pattern(), rx.pattern());
         QCOMPARE(result.patternOptions() & QRegularExpression::CaseInsensitiveOption, 0);
@@ -1134,7 +1134,7 @@ void tst_QJSValue::toVariant()
         QVERIFY(array.isArray());
         QCOMPARE(array.property("length").toInt(), 2);
         QVariant ret = array.toVariant();
-        QCOMPARE(ret.type(), QVariant::List);
+        QCOMPARE(ret.userType(), QVariant::List);
         QVariantList listOut = ret.toList();
         QCOMPARE(listOut.size(), listIn.size());
         for (int i = 0; i < listIn.size(); ++i)