From add272dbbb48e794c550fbf5794baa236c797bb7 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 16 Jun 2021 22:18:56 +0200 Subject: [PATCH] QmlDesigner.Tests: Use simplifiedTypeName for QtObject and Component It is ambiguous if QtObject and Component come from QtQml or QtQuick. Change-Id: I2e1dd48d80ee7aec8293eac85160d62a584c2819 Reviewed-by: Christian Stenger --- tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp index 95fb9612f15..e8f1f5f6e2d 100644 --- a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp +++ b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp @@ -2894,7 +2894,7 @@ void tst_TestCore::testRewriterComponentId() ModelNode component(rootModelNode.directSubModelNodes().first()); QVERIFY(component.isValid()); - QCOMPARE(component.type(), QmlDesigner::TypeName("QtQml.Component")); + QCOMPARE(component.simplifiedTypeName(), QmlDesigner::TypeName("Component")); QCOMPARE(component.id(), QString("testComponent")); } @@ -4286,7 +4286,7 @@ void tst_TestCore::testMetaInfoUncreatableType() NodeMetaInfo qObjectTypeInfo = animationTypeInfo.directSuperClass(); QVERIFY(qObjectTypeInfo.isValid()); - QCOMPARE(qObjectTypeInfo.typeName(), QmlDesigner::TypeName("QtQml.QtObject")); + QCOMPARE(qObjectTypeInfo.simplifiedTypeName(), QmlDesigner::TypeName("QtObject")); QCOMPARE(animationTypeInfo.superClasses().size(), 2); }