From d0491c87a9f0f2dadc9ef0e0a267b8c241c08b41 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Wed, 13 Feb 2013 17:42:56 +0100 Subject: qmlplugindump: don't crash if a composite type was a registered This doesn't actually result in putting any information about the composite type into the output, though. Change-Id: I160702578f0acd22eff98e8afa288b3c9fb20076 Reviewed-by: Alan Alpert --- tools/qmlplugindump/main.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'tools') diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index b5ee08ddd3..e05c77cbfa 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -184,11 +184,13 @@ QSet collectReachableMetaObjects(QQmlEngine *engine, const QHash > extensions; foreach (const QQmlType *ty, QQmlMetaType::qmlTypes()) { - qmlTypesByCppName[ty->metaObject()->className()].insert(ty); - if (ty->isExtendedType()) { - extensions[ty->typeName()].insert(ty->metaObject()->className()); + if (!ty->isComposite()) { + qmlTypesByCppName[ty->metaObject()->className()].insert(ty); + if (ty->isExtendedType()) + extensions[ty->typeName()].insert(ty->metaObject()->className()); + collectReachableMetaObjects(ty, &metas); } - collectReachableMetaObjects(ty, &metas); + // TODO actually handle composite types } // Adjust exports of the base object if there are extensions. -- cgit v1.2.3