diff options
| author | David Skoland <david.skoland@qt.io> | 2020-11-02 11:09:38 +0100 |
|---|---|---|
| committer | David Skoland <david.skoland@qt.io> | 2020-11-02 14:56:00 +0100 |
| commit | e47edfe7a75eb9240604e66fc6a400ebef83b6a0 (patch) | |
| tree | dfb655d9c2872bb2dbe3575a3a1d74aa1a8f47c8 /tests/auto/qml/qjsvalue/tst_qjsvalue.cpp | |
| parent | 50ba4ffdf48461d38f4dd2137a0fbbc916c9eb0a (diff) | |
Update tests to use new metaType system
Change from the QVariant enum to the QMetaType enum and prefer typeId
over userType where possible
Change-Id: Ic89c55978d46cc23d23b8e9c82c475c0c220fae3
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'tests/auto/qml/qjsvalue/tst_qjsvalue.cpp')
| -rw-r--r-- | tests/auto/qml/qjsvalue/tst_qjsvalue.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp b/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp index 903d372cfb..cdf04ceb00 100644 --- a/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp +++ b/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp @@ -976,8 +976,9 @@ void tst_QJSValue::toVariant() QCOMPARE(qjsvalue_cast<QVariant>(number), QVariant(123.0)); QJSValue intNumber = eng.toScriptValue((qint32)123); - QCOMPARE(intNumber.toVariant().type(), QVariant((qint32)123).type()); - QCOMPARE((qjsvalue_cast<QVariant>(number)).type(), QVariant((qint32)123).type()); + QCOMPARE(intNumber.toVariant().typeId(), QVariant((qint32)123).typeId()); + QCOMPARE((qjsvalue_cast<QVariant>(number)).typeId(), + QVariant((qint32)123).typeId()); QJSValue falskt = eng.toScriptValue(false); QCOMPARE(falskt.toVariant(), QVariant(false)); @@ -998,7 +999,7 @@ void tst_QJSValue::toVariant() QJSValue qobject = eng.newQObject(&temp); { QVariant var = qobject.toVariant(); - QCOMPARE(var.userType(), int(QMetaType::QObjectStar)); + QCOMPARE(var.typeId(), int(QMetaType::QObjectStar)); QCOMPARE(qvariant_cast<QObject*>(var), (QObject *)&temp); } @@ -1060,7 +1061,7 @@ void tst_QJSValue::toVariant() QVERIFY(array.isArray()); QCOMPARE(array.property("length").toInt(), 2); QVariant ret = array.toVariant(); - QCOMPARE(ret.userType(), QVariant::List); + QCOMPARE(ret.typeId(), QMetaType::QVariantList); QVariantList listOut = ret.toList(); QCOMPARE(listOut.size(), listIn.size()); for (int i = 0; i < listIn.size(); ++i) |