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

QmlDesigner: Add test if the instance exists

Browse Source 
Change-Id: I03f7e32aa0eda1f493c24ba174c706f4b8b0442c
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
This commit is contained in:
Marco Bubke
2014-06-17 14:23:33 +02:00
parent 029cd279c3
commit 6cee8a42ff
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
View File

@@ -280,12 +280,13 @@ void NodeInstanceServer::removeProperties(const RemovePropertiesCommand &command
void NodeInstanceServer::reparentInstances(const QVector<ReparentContainer> &containerVector)
{
foreach (const ReparentContainer &container, containerVector) {
ServerNodeInstance instance = instanceForId(container.instanceId());
if (instance.isValid()) {
instance.reparent(instanceForId(container.oldParentInstanceId()), container.oldParentProperty(), instanceForId(container.newParentInstanceId()), container.newParentProperty());
if (hasInstanceForId(container.instanceId())) {
ServerNodeInstance instance = instanceForId(container.instanceId());
if (instance.isValid()) {
instance.reparent(instanceForId(container.oldParentInstanceId()), container.oldParentProperty(), instanceForId(container.newParentInstanceId()), container.newParentProperty());
}
}
}
}
void NodeInstanceServer::reparentInstances(const ReparentInstancesCommand &command)