2 files changed, 18 insertions, 13 deletions
diff --git a/src/qmltyperegistrar/qmltypesclassdescription.cpp b/src/qmltyperegistrar/qmltypesclassdescription.cpp
index 70a4e49d19..2310b8b3b2 100644
--- a/src/qmltyperegistrar/qmltypesclassdescription.cpp
+++ b/src/qmltyperegistrar/qmltypesclassdescription.cpp
@@ -112,9 +112,14 @@ void QmlTypesClassDescription::collectLocalAnonymous(
     const auto classInfos = classDef->value(QLatin1String("classInfos")).toArray();
     for (const QJsonValue &classInfo : classInfos) {
         const QJsonObject obj = classInfo.toObject();
-        if (obj[QLatin1String("name")].toString() == QLatin1String("DefaultProperty")) {
+        const QString name = obj[QStringLiteral("name")].toString();
+        const QString value = obj[QStringLiteral("value")].toString();
+
+        if (name == QStringLiteral("DefaultProperty")) {
             defaultProp = obj[QLatin1String("value")].toString();
-            break;
+        } else if (name == QStringLiteral("QML.Extended")) {
+            extensionType = value;
+            collectRelated(value, types, foreign, defaultRevision);
         }
     }
 
diff --git a/src/qmltyperegistrar/qmltypescreator.cpp b/src/qmltyperegistrar/qmltypescreator.cpp
index 4dafdc4490..f754679fb9 100644
--- a/src/qmltyperegistrar/qmltypescreator.cpp
+++ b/src/qmltyperegistrar/qmltypescreator.cpp
@@ -61,6 +61,17 @@ void QmlTypesCreator::writeClassProperties(const QmlTypesClassDescription &colle
     if (!collector.sequenceValueType.isEmpty())
         m_qml.writeScriptBinding(QLatin1String("valueType"), enquote(collector.sequenceValueType));
 
+    if (!collector.extensionType.isEmpty())
+        m_qml.writeScriptBinding(QLatin1String("extension"), enquote(collector.extensionType));
+
+    if (!collector.implementsInterfaces.isEmpty()) {
+        QStringList interfaces;
+        for (const QString &interface : collector.implementsInterfaces)
+            interfaces << enquote(interface);
+
+        m_qml.writeArrayBinding(QLatin1String("interfaces"), interfaces);
+    }
+
     if (collector.elementName.isEmpty())
         return;
 
@@ -96,17 +107,6 @@ void QmlTypesCreator::writeClassProperties(const QmlTypesClassDescription &colle
 
     if (!collector.attachedType.isEmpty())
         m_qml.writeScriptBinding(QLatin1String("attachedType"), enquote(collector.attachedType));
-
-    if (!collector.extensionType.isEmpty())
-        m_qml.writeScriptBinding(QLatin1String("extension"), enquote(collector.extensionType));
-
-    if (!collector.implementsInterfaces.isEmpty()) {
-        QStringList interfaces;
-        for (const QString &interface : collector.implementsInterfaces)
-            interfaces << enquote(interface);
-
-        m_qml.writeArrayBinding(QLatin1String("interfaces"), interfaces);
-    }
 }
 
 void QmlTypesCreator::writeType(const QJsonObject &property, const QString &key, bool isReadonly,