From f74d3fbb069dd09d33cfe162171e9d2347fd083d Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Tue, 11 Oct 2011 12:47:46 +0200 Subject: [PATCH] QmlJS: Allow for 'ModuleApi' elements in qmltypes files. But ignore them for now. Reading them is a new feature that will be introduced in master. Change-Id: Id362caab2e3b48e198d87f59a0a7d99d24267378 Reviewed-on: http://codereview.qt-project.org/6431 Sanity-Review: Qt Sanity Bot Reviewed-by: Thomas Hartmann --- src/libs/qmljs/qmljstypedescriptionreader.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/libs/qmljs/qmljstypedescriptionreader.cpp b/src/libs/qmljs/qmljstypedescriptionreader.cpp index 318d98d7581..4c3f0bb0dbb 100644 --- a/src/libs/qmljs/qmljstypedescriptionreader.cpp +++ b/src/libs/qmljs/qmljstypedescriptionreader.cpp @@ -145,12 +145,14 @@ void TypeDescriptionReader::readModule(UiObjectDefinition *ast) for (UiObjectMemberList *it = ast->initializer->members; it; it = it->next) { UiObjectMember *member = it->member; UiObjectDefinition *component = dynamic_cast(member); - if (!component || Bind::toString(component->qualifiedTypeNameId) != "Component") { - addWarning(member->firstSourceLocation(), "Expected only 'Component' object definitions"); + const QString typeName = Bind::toString(component->qualifiedTypeNameId); + if (!component || (typeName != "Component" && typeName != "ModuleApi")) { + addWarning(member->firstSourceLocation(), "Expected only 'Component' and 'ModuleApi' object definitions"); continue; } - readComponent(component); + if (typeName == QLatin1String("Component")) + readComponent(component); } }