From b87462f714c9b047be226400f135913601d51d0e Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik.verbruggen@nokia.com>
Date: Thu, 7 Jan 2010 18:23:47 +0100
Subject: [PATCH] Fix id removal propagation to the qml editor.
---
src/plugins/qmldesigner/core/model/texttomodelmerger.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/plugins/qmldesigner/core/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/core/model/texttomodelmerger.cpp
index 107a49e8267..b1a2fda3373 100644
--- a/src/plugins/qmldesigner/core/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/core/model/texttomodelmerger.cpp
@@ -131,7 +131,10 @@ void TextToModelMerger::syncNode(ModelNode &modelNode, const QmlDomObject &domOb
{
const QString domObjectId = domObject.objectId();
- if (!domObjectId.isEmpty()) {
+ if (domObjectId.isEmpty()) {
+ if (!modelNode.id().isEmpty())
+ differenceHandler.idsDiffer(modelNode, domObjectId);
+ } else {
if (modelNode.id() != domObjectId)
differenceHandler.idsDiffer(modelNode, domObjectId);
}
--
GitLab