summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2009-10-23 04:25:29 (GMT)
committerYann Bodson <yann.bodson@nokia.com>2009-10-23 04:25:29 (GMT)
commit71f947ef8758dd99405a5386d0ba945b1c25699c (patch)
tree549ddaff8377b191267e384812e38b2457874999 /src/declarative
parent3386479da9526f0ae8978cd9e0afdd0559049ef9 (diff)
downloadQt-71f947ef8758dd99405a5386d0ba945b1c25699c.zip
Qt-71f947ef8758dd99405a5386d0ba945b1c25699c.tar.gz
Qt-71f947ef8758dd99405a5386d0ba945b1c25699c.tar.bz2
make ScriptAction work again
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/util/qmlanimation.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp
index 98453ed..f103a6b 100644
--- a/src/declarative/util/qmlanimation.cpp
+++ b/src/declarative/util/qmlanimation.cpp
@@ -826,7 +826,7 @@ void QmlScriptAction::setStateChangeScriptName(const QString &name)
void QmlScriptActionPrivate::execute()
{
- QmlScriptString scriptStr = hasRunScriptScript ? script : runScriptScript;
+ QmlScriptString scriptStr = hasRunScriptScript ? runScriptScript : script;
const QString &str = scriptStr.script();
if (!str.isEmpty()) {