summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qdeclarativeanimation.cpp
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2010-05-18 01:42:46 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2010-05-18 02:29:06 (GMT)
commit54c6a0101ba2bf3910126c53738e337712e5bb9a (patch)
treeb7aa9899ced985de5e89d3f70b4ef79abb3c61f4 /src/declarative/util/qdeclarativeanimation.cpp
parent96d5029126707771a3b956e6db0391ae7d619853 (diff)
downloadQt-54c6a0101ba2bf3910126c53738e337712e5bb9a.zip
Qt-54c6a0101ba2bf3910126c53738e337712e5bb9a.tar.gz
Qt-54c6a0101ba2bf3910126c53738e337712e5bb9a.tar.bz2
Add parent parameter to QDeclarativeExpression constructor.
Also rearrange the parameter order to be more clear.
Diffstat (limited to 'src/declarative/util/qdeclarativeanimation.cpp')
-rw-r--r--src/declarative/util/qdeclarativeanimation.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 67440b6..3017e22 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -786,7 +786,7 @@ void QDeclarativeScriptActionPrivate::execute()
const QString &str = scriptStr.script();
if (!str.isEmpty()) {
- QDeclarativeExpression expr(scriptStr.context(), str, scriptStr.scopeObject());
+ QDeclarativeExpression expr(scriptStr.context(), scriptStr.scopeObject(), str);
QDeclarativeData *ddata = QDeclarativeData::get(q);
if (ddata && ddata->outerContext && !ddata->outerContext->url.isEmpty())
expr.setSourceLocation(ddata->outerContext->url.toString(), ddata->lineNumber);