From 23657d2c6f005ff9f13a0e07885899e2151fe8c8 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@nokia.com>
Date: Tue, 12 Jan 2010 13:36:28 +0100
Subject: [PATCH] Fix id setting in the ObjectNodeInstance
---
.../qmldesigner/core/instances/objectnodeinstance.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/plugins/qmldesigner/core/instances/objectnodeinstance.cpp b/src/plugins/qmldesigner/core/instances/objectnodeinstance.cpp
index f5b5ab48d2e..eaf255ef833 100644
--- a/src/plugins/qmldesigner/core/instances/objectnodeinstance.cpp
+++ b/src/plugins/qmldesigner/core/instances/objectnodeinstance.cpp
@@ -152,10 +152,12 @@ void ObjectNodeInstance::setNodeInstance(NodeInstanceView *view)
void ObjectNodeInstance::setId(const QString &id)
{
+ if (!object()->objectName().isEmpty()) {
+ context()->engine()->rootContext()->setContextProperty(object()->objectName(), 0);
+ }
+
if (!id.isEmpty()) {
context()->engine()->rootContext()->setContextProperty(id, object()); // will also force refresh of all bindings
- } else if (!object()->objectName().isEmpty()) {
- context()->engine()->rootContext()->setContextProperty(object()->objectName(), 0);
}
object()->setObjectName(id);
--
GitLab