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

Conflicts:
  src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
  src/plugins/qmldesigner/components/stateseditornew/stateseditorview.cpp
  src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp
  src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp

Change-Id: I4c8a33736b25c3bb24241224d0a1e7358bb7fd94
This commit is contained in:
Tim Jenssen
2023-06-08 16:21:43 +02:00
156 changed files with 1603 additions and 706 deletions

View File

@@ -649,6 +649,7 @@ QList<StaticAnalysis::Type> Check::defaultDisabledMessages()
HintBinaryOperatorSpacing,
HintOneStatementPerLine,
HintExtraParentheses,
WarnAliasReferRootHierarchy,
// QmlDesigner related
WarnImperativeCodeNotEditableInVisualDesigner,
@@ -748,6 +749,7 @@ void Check::enableQmlDesignerChecks()
enableMessage(WarnReferenceToParentItemNotSupportedByVisualDesigner);
enableMessage(ErrUnsupportedRootTypeInVisualDesigner);
enableMessage(ErrInvalidIdeInVisualDesigner);
enableMessage(WarnAliasReferRootHierarchy);
//## triggers too often ## check.enableMessage(StaticAnalysis::WarnUndefinedValueForVisualDesigner);
}