From 033a094a2e83be79535d2a1e03c313aac8e13464 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@nokia.com>
Date: Mon, 11 Jan 2010 15:52:37 +0100
Subject: [PATCH] Fix id removing
Task-number: BAUHAUS-267
---
.../qmldesigner/core/instances/objectnodeinstance.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/plugins/qmldesigner/core/instances/objectnodeinstance.cpp b/src/plugins/qmldesigner/core/instances/objectnodeinstance.cpp
index 6ebcc111da4..ca1716200fe 100644
--- a/src/plugins/qmldesigner/core/instances/objectnodeinstance.cpp
+++ b/src/plugins/qmldesigner/core/instances/objectnodeinstance.cpp
@@ -152,13 +152,13 @@ void ObjectNodeInstance::setNodeInstance(NodeInstanceView *view)
void ObjectNodeInstance::setId(const QString &id)
{
- object()->setObjectName(id);
-
if (!id.isEmpty()) {
context()->engine()->rootContext()->setContextProperty(id, object()); // will also force refresh of all bindings
- } else {
- context()->engine()->rootContext()->setContextProperty(id, 0);
+ } else if (!object()->objectName().isEmpty()) {
+ context()->engine()->rootContext()->setContextProperty(object()->objectName(), 0);
}
+
+ object()->setObjectName(id);
}
bool ObjectNodeInstance::isQmlGraphicsItem() const
--
GitLab