summaryrefslogtreecommitdiffstats
path: root/src/declarative/util
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-11-10 01:42:00 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-11-10 01:42:00 (GMT)
commit2b1617e7e6050bef8de0f6d2129f4414a1b3ec28 (patch)
tree0e7fca9239079df3f734a32259efdf3e181daa7c /src/declarative/util
parent80cc666f4f3c7cc2fc6aed806951564066011e09 (diff)
downloadQt-2b1617e7e6050bef8de0f6d2129f4414a1b3ec28.zip
Qt-2b1617e7e6050bef8de0f6d2129f4414a1b3ec28.tar.gz
Qt-2b1617e7e6050bef8de0f6d2129f4414a1b3ec28.tar.bz2
Test (and fix) animation actions.
Diffstat (limited to 'src/declarative/util')
-rw-r--r--src/declarative/util/qmlstateoperations.cpp12
-rw-r--r--src/declarative/util/qmlstateoperations_p.h2
2 files changed, 14 insertions, 0 deletions
diff --git a/src/declarative/util/qmlstateoperations.cpp b/src/declarative/util/qmlstateoperations.cpp
index 1b786d2..2fca002 100644
--- a/src/declarative/util/qmlstateoperations.cpp
+++ b/src/declarative/util/qmlstateoperations.cpp
@@ -319,6 +319,13 @@ void QmlStateChangeScript::setScript(const QmlScriptString &s)
d->script = s;
}
+/*!
+ \qmlproperty script StateChangeScript::script
+ This property holds the name of the script. This name can be used by a
+ ScriptAction to target a specific script.
+
+ \sa ScriptAction::stateChangeScriptName
+*/
QString QmlStateChangeScript::name() const
{
Q_D(const QmlStateChangeScript);
@@ -351,6 +358,11 @@ QmlStateChangeScript::ActionList QmlStateChangeScript::actions()
return rv;
}
+QString QmlStateChangeScript::typeName() const
+{
+ return QLatin1String("StateChangeScript");
+}
+
/*!
\qmlclass AnchorChanges QmlAnchorChanges
\brief The AnchorChanges element allows you to change the anchors of an item in a state.
diff --git a/src/declarative/util/qmlstateoperations_p.h b/src/declarative/util/qmlstateoperations_p.h
index 2801f2b..861e4d0 100644
--- a/src/declarative/util/qmlstateoperations_p.h
+++ b/src/declarative/util/qmlstateoperations_p.h
@@ -96,6 +96,8 @@ public:
virtual ActionList actions();
+ virtual QString typeName() const;
+
QmlScriptString script() const;
void setScript(const QmlScriptString &);