From f53ed53ab28183f169a27057360efc179edf5e10 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Tue, 11 Jun 2024 11:32:59 +0200 Subject: [PATCH] QmlDesigner: Fix custom parser tests 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 --- .../qmldesigner/designercore/model/texttomodelmerger.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index 9dc98ba008a..6fadaeddff1 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -408,7 +408,10 @@ bool equals(const QVariant &a, const QVariant &b) bool usesCustomParserButIsNotPropertyChange(const QmlDesigner::NodeMetaInfo &nodeMetaInfo) { - return nodeMetaInfo.usesCustomParser() && !nodeMetaInfo.isQtQuickPropertyChanges(); + bool usesCustomParser = nodeMetaInfo.usesCustomParser(); + bool isQtQuickPropertyChanges = nodeMetaInfo.isQtQuickPropertyChanges(); + + return usesCustomParser && !isQtQuickPropertyChanges; } } // anonymous namespace @@ -1147,7 +1150,7 @@ void TextToModelMerger::syncNode(ModelNode &modelNode, if (info.isQmlComponent() || isImplicitComponent) setupComponentDelayed(modelNode, differenceHandler.isAmender()); - else if (info.usesCustomParser()) + else if (usesCustomParserButIsNotPropertyChange(info)) setupCustomParserNodeDelayed(modelNode, differenceHandler.isAmender()); else if (!modelNode.nodeSource().isEmpty() || modelNode.nodeSourceType() != ModelNode::NodeWithoutSource) clearImplicitComponentDelayed(modelNode, differenceHandler.isAmender());