feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix crash in metainfo loading

Browse Source 
Some Bauhaus types seem to have a valid QMetaObject with an
empty class name ...
This commit is contained in:
Kai Koehne
2010-04-23 13:05:33 +02:00
parent 716f2bb33c
commit f7ca9efbdc
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmldesigner/core/metainfo/metainfo.cpp
View File

@@ -191,6 +191,12 @@ void MetaInfoPrivate::parseNonQmlClassRecursively(const QMetaObject *qMetaObject
{ {
Q_ASSERT_X(qMetaObject, Q_FUNC_INFO, "invalid QMetaObject"); Q_ASSERT_X(qMetaObject, Q_FUNC_INFO, "invalid QMetaObject");
const QString className = qMetaObject->className(); const QString className = qMetaObject->className();
if (className.isEmpty()) {
qWarning() << "Meta type system: Registered class has no name.";
return;
}
if ( !m_q->hasNodeMetaInfo(className) if ( !m_q->hasNodeMetaInfo(className)
&& !QDeclarativeMetaType::qmlTypeNames().contains(typeName(qMetaObject).toAscii()) ) { && !QDeclarativeMetaType::qmlTypeNames().contains(typeName(qMetaObject).toAscii()) ) {
NodeMetaInfo nodeMetaInfo(*m_q); NodeMetaInfo nodeMetaInfo(*m_q);