feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner.NodeInstances: Reparent after value setting

Browse Source 
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>
This commit is contained in:
Marco Bubke
2011-07-21 18:39:50 +02:00
parent 773bc1a799
commit f9a3fd338c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
share/qtcreator/qml/qmlpuppet/instances/nodeinstanceserver.cpp
+2 -1
View File
@@ -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);