From d3dae6b7ddbc1edc15e30b2ac5cd8625d0f333f5 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 24 Mar 2022 12:48:25 +0200 Subject: QmlDesigner: Don't generate new id for node if already set Source template may already set the id for the generated node, in which case we don't want to override it. Fixes: QDS-6530 Change-Id: I22b86e6bb744372ad07924f440a6ecd0dad54095 Reviewed-by: Thomas Hartmann --- src/plugins/qmldesigner/designercore/model/qmlvisualnode.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/designercore/model/qmlvisualnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlvisualnode.cpp index f8044fd6da..cc7ab77615 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlvisualnode.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlvisualnode.cpp @@ -335,7 +335,8 @@ QmlObjectNode QmlVisualNode::createQmlObjectNode(AbstractView *view, if (!newQmlObjectNode.isValid()) return; - newQmlObjectNode.modelNode().setIdWithoutRefactoring(view->model()->generateNewId(itemLibraryEntry.name())); + if (newQmlObjectNode.id().isEmpty()) + newQmlObjectNode.modelNode().setIdWithoutRefactoring(view->model()->generateNewId(itemLibraryEntry.name())); for (const auto &propertyBindingEntry : propertyBindingList) newQmlObjectNode.modelNode().bindingProperty(propertyBindingEntry.first).setExpression(propertyBindingEntry.second); -- cgit v1.2.3