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

QmlDesigner: Delete dangling transitions when deleting FlowTarget

Browse Source 
Change-Id: Ic2bf68cd19ced976c5337b02bd9b1889c055f182
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2020-04-15 19:29:50 +02:00
parent 85597f85b0
commit d84bbdb876
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
View File

@@ -381,11 +381,19 @@ void QmlObjectNode::destroy()
timeline.destroyKeyframesForTarget(subNode); timeline.destroyKeyframesForTarget(subNode);
} }
if (QmlFlowActionAreaNode::isValidQmlFlowActionAreaNode(modelNode())) bool wasFlowEditorTarget = false;
QmlFlowActionAreaNode(modelNode()).destroyTarget(); if (QmlFlowTargetNode::isFlowEditorTarget(modelNode())) {
QmlFlowTargetNode(modelNode()).destroyTargets();
wasFlowEditorTarget = true;
}
removeStateOperationsForChildren(modelNode()); removeStateOperationsForChildren(modelNode());
QmlFlowViewNode root(view()->rootModelNode());
modelNode().destroy(); modelNode().destroy();
if (wasFlowEditorTarget && root.isValid())
root.removeDanglingTransitions();
} }
void QmlObjectNode::ensureAliasExport() void QmlObjectNode::ensureAliasExport()