diff options
| -rw-r--r-- | src/declarative/qml/qmlmetaproperty.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/util/qmlanimation.cpp | 8 | ||||
| -rw-r--r-- | src/declarative/util/qmlanimation.h | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp index be02bcb..f9b222f 100644 --- a/src/declarative/qml/qmlmetaproperty.cpp +++ b/src/declarative/qml/qmlmetaproperty.cpp @@ -532,7 +532,7 @@ QmlAbstractBinding *QmlMetaProperty::binding() const QmlAbstractBinding *binding = data->bindings; while (binding) { // ### This wont work for value types - if (binding->propertyIndex() == d->coreIdx) //### should we check for enabled? + if (binding->propertyIndex() == d->coreIdx) return binding; binding = binding->m_nextBinding; } 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 &); |