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

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

Browse Source 
Done-with: Erik Verbruggen
This commit is contained in:
Christian Kamm
2010-04-29 13:52:12 +02:00
parent 61c1ac37a0
commit cb04bea92d
2 changed files with 36 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/tools/qml/qmldump/main.cpp
View File

@@ -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);