aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-08-24 14:10:41 +0200
committerFabian Kosmale <fabian.kosmale@qt.io>2020-08-28 13:49:08 +0200
commit8248b5a485a2b8885442d6511906526548d9d07e (patch)
tree07d17281483f54fcbe28ed5a1add80ae0313e381 /tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
parent43a532deffce7ee8c273dbff19c1b0ca941e636d (diff)
Always group the metaType and listType together
They are always created and destroyed together, so grouping them makes the required memory management of them easier. Change-Id: Ia1980f31f9bdff6a1accd229bc8380ae153edf67 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp')
-rw-r--r--tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index 2932b112e3..fe14964b7e 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -5483,7 +5483,7 @@ void tst_qqmllanguage::selfReference()
const QMetaObject *metaObject = o->metaObject();
QMetaProperty selfProperty = metaObject->property(metaObject->indexOfProperty("self"));
- QCOMPARE(selfProperty.userType(), compilationUnit->metaTypeId.id());
+ QCOMPARE(selfProperty.userType(), compilationUnit->typeIds.id.id());
QByteArray typeName = selfProperty.typeName();
QVERIFY(typeName.endsWith('*'));
@@ -5492,7 +5492,7 @@ void tst_qqmllanguage::selfReference()
QMetaMethod selfFunction = metaObject->method(metaObject->indexOfMethod("returnSelf()"));
QVERIFY(selfFunction.isValid());
- QCOMPARE(selfFunction.returnType(), compilationUnit->metaTypeId.id());
+ QCOMPARE(selfFunction.returnType(), compilationUnit->typeIds.id.id());
QMetaMethod selfSignal;
@@ -5506,7 +5506,7 @@ void tst_qqmllanguage::selfReference()
QVERIFY(selfSignal.isValid());
QCOMPARE(selfSignal.parameterCount(), 1);
- QCOMPARE(selfSignal.parameterType(0), compilationUnit->metaTypeId.id());
+ QCOMPARE(selfSignal.parameterType(0), compilationUnit->typeIds.id.id());
}
void tst_qqmllanguage::selfReferencingSingleton()