Merge remote-tracking branch 'origin/4.8' into 4.9

Change-Id: Id4fcb992acf20341a247d5d98a059b5dfde542ff
2019-03-21 11:26:25 +01:00
parent 88855cefcd c212c3c72c
commit 1656402605
1 changed files with 10 additions and 4 deletions
--- a/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml
+++ b/share/qtcreator/qmldesigner/statesEditorQmlSources/StatesDelegate.qml
@@ -154,11 +154,17 @@ Rectangle {
                __panel.visible = false
        }

-        onEditingFinished: {
-            if (text != delegateStateName)
-                statesEditorModel.renameState(internalNodeId, text)
-        }
+        property string oldValue

+        onEditingFinished: {
+            if (stateNameField.oldValue === stateNameField.text)
+                return
+
+            stateNameField.oldValue = stateNameField.text
+
+            if (stateNameField.text != delegateStateName)
+                statesEditorModel.renameState(internalNodeId, stateNameField.text)
+        }
    }

    Item {