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

Merge remote-tracking branch 'origin/11.0' into qds/dev

Browse Source 
Change-Id: I2bf1a2a72d9765d9b4088840414b4933644db47a
This commit is contained in:
Tim Jenssen
2023-09-14 14:16:37 +02:00
parent 4b1862fdb1 fc79d938ef
commit a603b65f18
40 changed files with 8404 additions and 6385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2053,14 +2053,14 @@ const Value *Check::checkScopeObjectMember(const UiQualifiedId *id)
return nullptr;
if (!value) {
// We omit M16 messages if the type using ImmediateProperties
// Ideally, we should obtain them through metaobject information
const bool omitMessage = !m_typeStack.isEmpty()
&& ((m_typeStack.last() == "PropertyChanges")
|| m_typeStack.last() == "Binding")
&& !m_idStack.isEmpty() && m_idStack.last().contains(propertyName);
if (!omitMessage)
// We omit M16 messages if the enclosing type have ImmediateProperties classinfo.
// Ideally, we should get this information from metaobject by checking the index
// metaObject->indexOfClassInfo("ImmediatePropertyNames"), for now it's hard coded.
if ( !m_typeStack.isEmpty()
&& ((m_typeStack.last() != "PropertyChanges")
&& m_typeStack.last() != "Binding")) {
addMessage(ErrInvalidPropertyName, id->identifierToken, propertyName);
}
return nullptr;
}