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

Don't error for unknown property names inside ListElement for now.

Browse Source
This commit is contained in:
Christian Kamm
2010-02-17 09:01:39 +01:00
parent 4ab2272a89
commit a0431f0563
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libs/qmljs/qmljscheck.cpp
View File

@@ -98,8 +98,21 @@ void Check::visitQmlObject(Node *ast, UiQualifiedId *typeId,
_context.setQmlScopeObject(scopeObject);
#ifndef NO_DECLARATIVE_BACKEND
// check if the object has a Qt.PropertyChanges ancestor
// check if the object has a Qt.ListElement ancestor
const ObjectValue *prototype = scopeObject->prototype(&_context);
while (prototype) {
if (const QmlObjectValue *qmlMetaObject = dynamic_cast<const QmlObjectValue *>(prototype)) {
// ### Also check for Qt package. Involves changes in QmlObjectValue.
if (qmlMetaObject->qmlTypeName() == QLatin1String("ListElement")) {
_allowAnyProperty = true;
break;
}
}
prototype = prototype->prototype(&_context);
}
// check if the object has a Qt.PropertyChanges ancestor
prototype = scopeObject->prototype(&_context);
while (prototype) {
if (const QmlObjectValue *qmlMetaObject = dynamic_cast<const QmlObjectValue *>(prototype)) {
// ### Also check for Qt package. Involves changes in QmlObjectValue.
@@ -108,7 +121,6 @@ void Check::visitQmlObject(Node *ast, UiQualifiedId *typeId,
}
prototype = prototype->prototype(&_context);
}
// find the target script binding
if (prototype && initializer) {
for (UiObjectMemberList *m = initializer->members; m; m = m->next) {