QmlDesigner: fixes state editing in text

In the stateseditor we have to use propertiesRemoved instead of
propertiesAboutToBeRemoved when reseting the model. Otherwise
the change we want to react to has not happened, yet.
Some sanity checking in the property editor.

In the DesignDocumentController we slightly change the order.
The textMoifider is activated (again) before we set back the old
state.
Note: We do check for isValid() since the rewriter might delete the state.


Reviewed-by: Kai Koehne
Task-number: QTCREATORBUG-4199

1 files changed, 1 insertions, 1 deletions

diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h
index e09fe0d3a1..58b31ea083 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h
+++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h
@@ -57,7 +57,7 @@ public:
     // AbstractView
     void modelAttached(Model *model);
     void modelAboutToBeDetached(Model *model);
-    void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList);
+    void propertiesRemoved(const QList<AbstractProperty>& propertyList);
     void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange);
 
     void nodeAboutToBeRemoved(const ModelNode &removedNode);