Update ScriptAction and StateChangeScript to use QmlScriptString.

Now you can assign the script you want to run to the property directly,
rather than assigning a string.

Task-number: QT-734

1 files changed, 4 insertions, 6 deletions

diff --git a/src/declarative/util/qmlanimation.h b/src/declarative/util/qmlanimation.h
index 508b2b5..7898980 100644
--- a/src/declarative/util/qmlanimation.h
+++ b/src/declarative/util/qmlanimation.h
@@ -49,6 +49,7 @@
 #include <QtDeclarative/qmlpropertyvaluesource.h>
 #include <QtDeclarative/qmlstate.h>
 #include <QtDeclarative/qml.h>
+#include <QtDeclarative/qmlscriptstring.h>
 
 QT_BEGIN_HEADER
 
@@ -161,22 +162,19 @@ class QmlScriptAction : public QmlAbstractAnimation
     Q_OBJECT
     Q_DECLARE_PRIVATE(QmlScriptAction)
 
-    Q_PROPERTY(QString script READ script WRITE setScript NOTIFY scriptChanged)
+    Q_PROPERTY(QmlScriptString script READ script WRITE setScript)
     Q_PROPERTY(QString stateChangeScriptName READ stateChangeScriptName WRITE setStateChangeScriptName)
 
 public:
     QmlScriptAction(QObject *parent=0);
     virtual ~QmlScriptAction();
 
-    QString script() const;
-    void setScript(const QString &);
+    QmlScriptString script() const;
+    void setScript(const QmlScriptString &);
 
     QString stateChangeScriptName() const;
     void setStateChangeScriptName(const QString &);
 
-Q_SIGNALS:
-    void scriptChanged(const QString &);
-
 protected:
     virtual void transition(QmlStateActions &actions,
                             QmlMetaProperties &modified,