diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2013-02-13 17:42:56 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-18 17:51:35 +0100 |
| commit | d0491c87a9f0f2dadc9ef0e0a267b8c241c08b41 (patch) | |
| tree | beebef48fd9209ae08023e3b831aaa36076519ba /tools | |
| parent | 4d3a64c5e65a781acb4acf4ba641456da28bd1e4 (diff) | |
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 <aalpert@rim.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlplugindump/main.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
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<const QMetaObject *> collectReachableMetaObjects(QQmlEngine *engine, const QHash<QByteArray, QSet<QByteArray> > 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. |