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

Conflicts:
	src/plugins/qmakeprojectmanager/qmakeproject.cpp

Change-Id: Ieb1c3e946f11d3c4fa1ee6b5afdf83cc532d8aed

src/libs/qmljs/qmljscheck.cpp

@@ -1838,7 +1838,10 @@ const Value *Check::checkScopeObjectMember(const UiQualifiedId *id)
 
     const bool isListElementScope = (!m_typeStack.isEmpty() && m_typeStack.last() == "ListElement");
 
-    if (!value && !isListElementScope) {
+    if (isListElementScope)
+        return nullptr;
+
+    if (!value) {
         addMessage(ErrInvalidPropertyName, id->identifierToken, propertyName);
         return nullptr;
     }