From ad944631340841f7f12d7669bbc4e7c136cbdef9 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Wed, 15 Apr 2020 19:33:33 +0200
Subject: [PATCH] QmlDesigner: Take care of deleted items in FormEditor

The FormEditor did not take care of deleted transition items
in all cases.

Change-Id: Ic5a700b98ae8c400ffd398c5c6972587e2863971
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 .../components/formeditor/formeditorview.cpp  | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
index 6149b248ce9..781bbab1ef1 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
@@ -169,25 +169,35 @@ static void deleteWithoutChildren(const QList<FormEditorItem*> &items)
     }
 }
 
+static bool isFlowNonItem(const QmlItemNode &itemNode)
+{
+    return itemNode.isFlowTransition()
+            || itemNode.isFlowWildcard()
+            || itemNode.isFlowWildcard();
+}
+
 void FormEditorView::removeNodeFromScene(const QmlItemNode &qmlItemNode)
 {
+    QList<FormEditorItem*> removedItemList;
+
     if (qmlItemNode.isValid()) {
         QList<QmlItemNode> nodeList;
         nodeList.append(qmlItemNode.allSubModelNodes());
         nodeList.append(qmlItemNode);
 
-        QList<FormEditorItem*> removedItemList;
-
         removedItemList.append(scene()->itemsForQmlItemNodes(nodeList));
-        m_currentTool->itemsAboutToRemoved(removedItemList);
 
         //The destructor of QGraphicsItem does delete all its children.
         //We have to keep the children if they are not children in the model anymore.
         //Otherwise we delete the children explicitly anyway.
         deleteWithoutChildren(removedItemList);
-    } else if (qmlItemNode.isFlowTransition()) {
-        deleteWithoutChildren(scene()->itemsForQmlItemNodes({qmlItemNode}));
+    } else if (isFlowNonItem(qmlItemNode)) {
+        removedItemList.append(scene()->itemsForQmlItemNodes({qmlItemNode}));
+        deleteWithoutChildren(removedItemList);
     }
+
+    if (!removedItemList.isEmpty())
+        m_currentTool->itemsAboutToRemoved(removedItemList);
 }
 
 void FormEditorView::hideNodeFromScene(const QmlItemNode &qmlItemNode)
@@ -308,6 +318,11 @@ void FormEditorView::propertiesAboutToBeRemoved(const QList<AbstractProperty>& p
                         removedItems.append(item);
                         delete item;
                     }
+                } else if (isFlowNonItem(qmlItemNode)) {
+                    if (FormEditorItem *item = m_scene->itemForQmlItemNode(qmlItemNode)) {
+                        removedItems.append(item);
+                        delete item;
+                    }
                 }
             }
         }