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

QmlJS: Fix bug in context property extraction.

Browse Source 
Skip forward declarations instead of giving up.

Change-Id: Id3a30296a7cefc4ef255d03727557dee6a37c362
Reviewed-on: http://codereview.qt-project.org/6321
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
This commit is contained in:
Christian Kamm
2011-10-10 13:36:00 +02:00
parent 42b56788ea
commit 918f5a0e2d
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp
View File

@@ -659,10 +659,13 @@ static void buildContextProperties(
typeScope = scope; // incorrect but may be an ok fallback
ClassOrNamespace *binding = typeOf.context().lookupType(namedType->name(), typeScope);
if (binding && !binding->symbols().isEmpty()) {
Class *klass = binding->symbols().first()->asClass();
if (klass) {
FakeMetaObject::Ptr fmo = buildFakeMetaObject(klass, fakeMetaObjects, typeOf);
typeName = fmo->className();
// find the best 'Class' symbol
for (int i = binding->symbols().size() - 1; i >= 0; --i) {
if (Class *klass = binding->symbols().at(i)->asClass()) {
FakeMetaObject::Ptr fmo = buildFakeMetaObject(klass, fakeMetaObjects, typeOf);
typeName = fmo->className();
break;
}
}
}
}