diff options
-rw-r--r-- | src/qmltyperegistrar/qmltypesclassdescription.cpp | 11 | ||||
-rw-r--r-- | tests/auto/qml/qmltyperegistrar/tst_qmltyperegistrar.cpp | 2 |
2 files changed, 3 insertions, 10 deletions
diff --git a/src/qmltyperegistrar/qmltypesclassdescription.cpp b/src/qmltyperegistrar/qmltypesclassdescription.cpp index 2310b8b3b2..82c1c31ec2 100644 --- a/src/qmltyperegistrar/qmltypesclassdescription.cpp +++ b/src/qmltyperegistrar/qmltypesclassdescription.cpp @@ -112,15 +112,8 @@ void QmlTypesClassDescription::collectLocalAnonymous( const auto classInfos = classDef->value(QLatin1String("classInfos")).toArray(); for (const QJsonValue &classInfo : classInfos) { const QJsonObject obj = classInfo.toObject(); - const QString name = obj[QStringLiteral("name")].toString(); - const QString value = obj[QStringLiteral("value")].toString(); - - if (name == QStringLiteral("DefaultProperty")) { - defaultProp = obj[QLatin1String("value")].toString(); - } else if (name == QStringLiteral("QML.Extended")) { - extensionType = value; - collectRelated(value, types, foreign, defaultRevision); - } + if (obj[QStringLiteral("name")].toString() == QStringLiteral("DefaultProperty")) + defaultProp = obj[obj[QStringLiteral("value")].toString()].toString(); } collectInterfaces(classDef); diff --git a/tests/auto/qml/qmltyperegistrar/tst_qmltyperegistrar.cpp b/tests/auto/qml/qmltyperegistrar/tst_qmltyperegistrar.cpp index b752c4d6c1..cd3596e142 100644 --- a/tests/auto/qml/qmltyperegistrar/tst_qmltyperegistrar.cpp +++ b/tests/auto/qml/qmltyperegistrar/tst_qmltyperegistrar.cpp @@ -88,7 +88,7 @@ void tst_qmltyperegistrar::superAndForeignTypes() QVERIFY(qmltypesData.contains("Property { name: \"height\"; type: \"int\"; read: \"height\"; write: \"setHeight\" }")); QVERIFY(qmltypesData.contains("Property { name: \"width\"; type: \"int\"; read: \"width\"; write: \"setWidth\" }")); QVERIFY(qmltypesData.contains("Method { name: \"sizeToString\"; type: \"QString\" }")); - QVERIFY(qmltypesData.contains("extension: \"SizeValueType\"")); + QCOMPARE(qmltypesData.count("extension: \"SizeValueType\""), 1); } void tst_qmltyperegistrar::accessSemantics() |