From 643f50e1875659f7ebd5f990ae68bb48511e133f Mon Sep 17 00:00:00 2001 From: Marco Bubke <marco.bubke@nokia.com> Date: Tue, 8 Feb 2011 22:26:00 +0100 Subject: [PATCH] QmlDesigner.NodeInstances: Create first dynamic properties --- .../instances/nodeinstanceserver.cpp | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserver.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserver.cpp index 45bfe607bd4..47e2829c876 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserver.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserver.cpp @@ -1014,11 +1014,25 @@ QList<ServerNodeInstance> NodeInstanceServer::setupScene(const CreateSceneComman instanceForId(container.instanceId()).setId(container.id()); } - foreach(const PropertyValueContainer &container, command.valueChanges()) - setInstancePropertyVariant(container); + foreach(const PropertyValueContainer &container, command.valueChanges()) { + if (container.isDynamic()) + setInstancePropertyVariant(container); + } - foreach(const PropertyBindingContainer &container, command.bindingChanges()) - setInstancePropertyBinding(container); + foreach(const PropertyValueContainer &container, command.valueChanges()) { + if (!container.isDynamic()) + setInstancePropertyVariant(container); + } + + foreach(const PropertyBindingContainer &container, command.bindingChanges()) { + if (container.isDynamic()) + setInstancePropertyBinding(container); + } + + foreach(const PropertyBindingContainer &container, command.bindingChanges()) { + if (!container.isDynamic()) + setInstancePropertyBinding(container); + } foreach(ServerNodeInstance instance, instanceList) instance.doComponentComplete(); -- GitLab