summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-09-03 03:57:14 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-09-03 03:57:14 (GMT)
commit15a51033a3efed2eafd3527758ea1f6b864d719b (patch)
treebb66d6cd8fd8bff9c9ea87b617e3da16e07f4d8c /src/declarative
parent17ffae16bd1ea4e4c37b2ef3d0dc0de2d5a517a1 (diff)
downloadQt-15a51033a3efed2eafd3527758ea1f6b864d719b.zip
Qt-15a51033a3efed2eafd3527758ea1f6b864d719b.tar.gz
Qt-15a51033a3efed2eafd3527758ea1f6b864d719b.tar.bz2
Renamee property to fit class name.
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/util/qmlanimation.cpp8
-rw-r--r--src/declarative/util/qmlanimation.h6
2 files changed, 7 insertions, 7 deletions
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp
index d224388..6047d4a 100644
--- a/src/declarative/util/qmlanimation.cpp
+++ b/src/declarative/util/qmlanimation.cpp
@@ -809,19 +809,19 @@ void QmlScriptAction::setScript(const QString &script)
}
/*!
- \qmlproperty QString ScriptAction::runScriptName
+ \qmlproperty QString ScriptAction::stateChangeScriptName
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 runScriptName are set, runScriptName will be used.
+ If both script and stateChangeScriptName are set, stateChangeScriptName will be used.
*/
-QString QmlScriptAction::runScriptName() const
+QString QmlScriptAction::stateChangeScriptName() const
{
Q_D(const QmlScriptAction);
return d->script;
}
-void QmlScriptAction::setRunScriptName(const QString &name)
+void QmlScriptAction::setStateChangeScriptName(const QString &name)
{
Q_D(QmlScriptAction);
d->name = name;
diff --git a/src/declarative/util/qmlanimation.h b/src/declarative/util/qmlanimation.h
index 7104f60..508b2b5 100644
--- a/src/declarative/util/qmlanimation.h
+++ b/src/declarative/util/qmlanimation.h
@@ -162,7 +162,7 @@ class QmlScriptAction : public QmlAbstractAnimation
Q_DECLARE_PRIVATE(QmlScriptAction)
Q_PROPERTY(QString script READ script WRITE setScript NOTIFY scriptChanged)
- Q_PROPERTY(QString runScriptName READ runScriptName WRITE setRunScriptName)
+ Q_PROPERTY(QString stateChangeScriptName READ stateChangeScriptName WRITE setStateChangeScriptName)
public:
QmlScriptAction(QObject *parent=0);
@@ -171,8 +171,8 @@ public:
QString script() const;
void setScript(const QString &);
- QString runScriptName() const;
- void setRunScriptName(const QString &);
+ QString stateChangeScriptName() const;
+ void setStateChangeScriptName(const QString &);
Q_SIGNALS:
void scriptChanged(const QString &);