From c5020c91ce01fa587be1805245a50eabc2a64a6f Mon Sep 17 00:00:00 2001
From: Henning Gruendl <henning.gruendl@qt.io>
Date: Thu, 22 Sep 2022 11:17:02 +0200
Subject: [PATCH] QmlDesigner: Reset default state when removed

Reset the default state to base state when a state is removed that is
currently the default.

Task-number: QDS-7743
Change-Id: Id60549ee0a61b2d3caf05ef2f00e25b74774e7d9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 share/qtcreator/qmldesigner/newstateseditor/Main.qml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/share/qtcreator/qmldesigner/newstateseditor/Main.qml b/share/qtcreator/qmldesigner/newstateseditor/Main.qml
index 8f50d8f3362..b0e7fa03bc6 100644
--- a/share/qtcreator/qmldesigner/newstateseditor/Main.qml
+++ b/share/qtcreator/qmldesigner/newstateseditor/Main.qml
@@ -771,7 +771,12 @@ Rectangle {
 
                                     onClone: root.cloneState(delegateRoot.internalNodeId)
                                     onExtend: root.extendState(delegateRoot.internalNodeId)
-                                    onRemove: root.deleteState(delegateRoot.internalNodeId)
+                                    onRemove: {
+                                        if (delegateRoot.isDefault)
+                                            statesEditorModel.resetDefaultState()
+
+                                        root.deleteState(delegateRoot.internalNodeId)
+                                    }
 
                                     onStateNameFinished: statesEditorModel.renameState(
                                                              delegateRoot.internalNodeId,