Merge remote-tracking branch 'origin/4.13' into master

Change-Id: I8a2dca29595a0770f4162786b15a145f3f4133af
2020-09-04 16:11:12 +03:00
parent b7573a7400 913dc6473d
commit e504d96934
49 changed files with 1254 additions and 128 deletions
--- a/src/libs/qmljs/qmljscheck.cpp
+++ b/src/libs/qmljs/qmljscheck.cpp
@@ -1835,7 +1835,10 @@ const Value *Check::checkScopeObjectMember(const UiQualifiedId *id)
        if (value)
            break;
    }
-    if (!value) {
+
+    const bool isListElementScope = (!m_typeStack.isEmpty() && m_typeStack.last() == "ListElement");
+
+    if (!value && !isListElementScope) {
        addMessage(ErrInvalidPropertyName, id->identifierToken, propertyName);
        return nullptr;
    }