From f7ca9efbdc6f35945475b4e34cb8872bae21949c Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Fri, 23 Apr 2010 13:05:33 +0200
Subject: [PATCH] QmlDesigner: Fix crash in metainfo loading
Some Bauhaus types seem to have a valid QMetaObject with an
empty class name ...
---
src/plugins/qmldesigner/core/metainfo/metainfo.cpp | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/plugins/qmldesigner/core/metainfo/metainfo.cpp b/src/plugins/qmldesigner/core/metainfo/metainfo.cpp
index d78dfb9221e..7d88c55de82 100644
--- a/src/plugins/qmldesigner/core/metainfo/metainfo.cpp
+++ b/src/plugins/qmldesigner/core/metainfo/metainfo.cpp
@@ -191,6 +191,12 @@ void MetaInfoPrivate::parseNonQmlClassRecursively(const QMetaObject *qMetaObject
{
Q_ASSERT_X(qMetaObject, Q_FUNC_INFO, "invalid QMetaObject");
const QString className = qMetaObject->className();
+
+ if (className.isEmpty()) {
+ qWarning() << "Meta type system: Registered class has no name.";
+ return;
+ }
+
if ( !m_q->hasNodeMetaInfo(className)
&& !QDeclarativeMetaType::qmlTypeNames().contains(typeName(qMetaObject).toAscii()) ) {
NodeMetaInfo nodeMetaInfo(*m_q);
--
GitLab