QmlJS: Fix qmldump to ignore extending types and update type xml.

Done-with: Erik Verbruggen

1 files changed, 8 insertions, 0 deletions

diff --git a/src/tools/qml/qmldump/main.cpp b/src/tools/qml/qmldump/main.cpp
index c5ab8257db..cabb550371 100644
--- a/src/tools/qml/qmldump/main.cpp
+++ b/src/tools/qml/qmldump/main.cpp
@@ -273,13 +273,21 @@ int main(int argc, char *argv[])
 
     metas.insert(FriendlyQObject::qtMeta());
 
+    // ### TODO: We don't treat extended types correctly. Currently only hits the
+    // QDeclarativeGraphicsWidget extension to QGraphicsWidget
     foreach (const QDeclarativeType *ty, QDeclarativeMetaType::qmlTypes()) {
+        if (ty->isExtendedType())
+            continue;
+
         cppToQml.insert(ty->metaObject()->className(), ty->qmlTypeName());
         qmlTypeByCppName.insert(ty->metaObject()->className(), ty);
         processDeclarativeType(ty, &metas);
     }
 
     foreach (const QDeclarativeType *ty, QDeclarativeMetaType::qmlTypes()) {
+        if (ty->isExtendedType())
+            continue;
+
         QByteArray tyName = ty->qmlTypeName();
         tyName = tyName.mid(tyName.lastIndexOf('/') + 1);