diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2022-03-24 12:48:25 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2022-03-24 10:58:11 +0000 |
| commit | d3dae6b7ddbc1edc15e30b2ac5cd8625d0f333f5 (patch) | |
| tree | dc1f65e227d33afa8ee19234841f80f801de22a2 | |
| parent | 38462c8f133f709f4b08f244fc7a5f3b6a44b541 (diff) | |
| download | qt-creator-d3dae6b7ddbc1edc15e30b2ac5cd8625d0f333f5.tar.gz | |
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 <thomas.hartmann@qt.io>
| -rw-r--r-- | src/plugins/qmldesigner/designercore/model/qmlvisualnode.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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); |