diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2010-03-24 04:19:14 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2010-03-24 06:10:31 (GMT) |
| commit | 08ef576f3bd492b60925c25945d9f8c2c8a26886 (patch) | |
| tree | f98c4b448f2952b143bdd35e56f7130db2eda54d /src/declarative/util | |
| parent | 20fa8670c14c5a34a36c41ce43ef98ae1610fafb (diff) | |
| download | Qt-08ef576f3bd492b60925c25945d9f8c2c8a26886.zip Qt-08ef576f3bd492b60925c25945d9f8c2c8a26886.tar.gz Qt-08ef576f3bd492b60925c25945d9f8c2c8a26886.tar.bz2 | |
Rename stateChangeScriptName to scriptName.
Diffstat (limited to 'src/declarative/util')
| -rw-r--r-- | src/declarative/util/qdeclarativeanimation.cpp | 4 | ||||
| -rw-r--r-- | src/declarative/util/qdeclarativeanimation_p.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp index bead842..b5530f7 100644 --- a/src/declarative/util/qdeclarativeanimation.cpp +++ b/src/declarative/util/qdeclarativeanimation.cpp @@ -698,11 +698,11 @@ void QDeclarativeScriptAction::setScript(const QDeclarativeScriptString &script) } /*! - \qmlproperty QString ScriptAction::stateChangeScriptName + \qmlproperty QString ScriptAction::scriptName This property holds the the name of the StateChangeScript to run. This property is only valid when ScriptAction is used as part of a transition. - If both script and stateChangeScriptName are set, stateChangeScriptName will be used. + If both script and scriptName are set, scriptName will be used. */ QString QDeclarativeScriptAction::stateChangeScriptName() const { diff --git a/src/declarative/util/qdeclarativeanimation_p.h b/src/declarative/util/qdeclarativeanimation_p.h index 356b015..33d5c35 100644 --- a/src/declarative/util/qdeclarativeanimation_p.h +++ b/src/declarative/util/qdeclarativeanimation_p.h @@ -163,7 +163,7 @@ class QDeclarativeScriptAction : public QDeclarativeAbstractAnimation Q_DECLARE_PRIVATE(QDeclarativeScriptAction) Q_PROPERTY(QDeclarativeScriptString script READ script WRITE setScript) - Q_PROPERTY(QString stateChangeScriptName READ stateChangeScriptName WRITE setStateChangeScriptName) + Q_PROPERTY(QString scriptName READ stateChangeScriptName WRITE setStateChangeScriptName) public: QDeclarativeScriptAction(QObject *parent=0); |