diff options
author | Marco Bubke <marco.bubke@nokia.com> | 2011-07-21 18:39:50 +0200 |
---|---|---|
committer | Marco Bubke <marco.bubke@nokia.com> | 2011-07-21 18:59:40 +0200 |
commit | f9a3fd338c743e458d7c430c5f32aa4132c2a50a (patch) | |
tree | c7f580c59680c2116811972113a3754c28c2910d | |
parent | 773bc1a799134c21b11d1a98956a94289055a5e7 (diff) | |
download | qt-creator-f9a3fd338c743e458d7c430c5f32aa4132c2a50a.tar.gz |
QmlDesigner.NodeInstances: Reparent after value setting
Change-Id: I06ac27d5043ab7f102972f0c054fc55fc77f6b15
Reviewed-on: http://codereview.qt.nokia.com/1994
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
-rw-r--r-- | share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.cpp index 5acbc7fcf8..02afe82c24 100644 --- a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.cpp @@ -403,7 +403,6 @@ void NodeInstanceServer::setupDummyData(const QUrl &fileUrl) QList<ServerNodeInstance> NodeInstanceServer::setupInstances(const CreateSceneCommand &command) { QList<ServerNodeInstance> instanceList = createInstances(command.instances()); - reparentInstances(command.reparentInstances()); foreach (const IdContainer &container, command.ids()) { if (hasInstanceForId(container.instanceId())) @@ -420,6 +419,8 @@ QList<ServerNodeInstance> NodeInstanceServer::setupInstances(const CreateSceneC setInstancePropertyVariant(container); } + reparentInstances(command.reparentInstances()); + foreach (const PropertyBindingContainer &container, command.bindingChanges()) { if (container.isDynamic()) setInstancePropertyBinding(container); |