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

QmlDesigner: Fix custom parser tests

Browse Source 
Because the new code model is returning the flag from the qmltypes
files, property changes have a custom parser.

Change-Id: I0dd479417e2fc6c9a1d972694a5644761fb48e89
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Bubke
2024-06-11 11:32:59 +02:00
parent 8d7e62fa5e
commit f53ed53ab2
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
View File

@@ -408,7 +408,10 @@ bool equals(const QVariant &a, const QVariant &b)
bool usesCustomParserButIsNotPropertyChange(const QmlDesigner::NodeMetaInfo &nodeMetaInfo) bool usesCustomParserButIsNotPropertyChange(const QmlDesigner::NodeMetaInfo &nodeMetaInfo)
{ {
return nodeMetaInfo.usesCustomParser() && !nodeMetaInfo.isQtQuickPropertyChanges(); bool usesCustomParser = nodeMetaInfo.usesCustomParser();
bool isQtQuickPropertyChanges = nodeMetaInfo.isQtQuickPropertyChanges();
return usesCustomParser && !isQtQuickPropertyChanges;
} }
} // anonymous namespace } // anonymous namespace
@@ -1147,7 +1150,7 @@ void TextToModelMerger::syncNode(ModelNode &modelNode,
if (info.isQmlComponent() || isImplicitComponent) if (info.isQmlComponent() || isImplicitComponent)
setupComponentDelayed(modelNode, differenceHandler.isAmender()); setupComponentDelayed(modelNode, differenceHandler.isAmender());
else if (info.usesCustomParser()) else if (usesCustomParserButIsNotPropertyChange(info))
setupCustomParserNodeDelayed(modelNode, differenceHandler.isAmender()); setupCustomParserNodeDelayed(modelNode, differenceHandler.isAmender());
else if (!modelNode.nodeSource().isEmpty() || modelNode.nodeSourceType() != ModelNode::NodeWithoutSource) else if (!modelNode.nodeSource().isEmpty() || modelNode.nodeSourceType() != ModelNode::NodeWithoutSource)
clearImplicitComponentDelayed(modelNode, differenceHandler.isAmender()); clearImplicitComponentDelayed(modelNode, differenceHandler.isAmender());