diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2010-05-18 01:42:46 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2010-05-18 02:29:06 (GMT) |
| commit | 54c6a0101ba2bf3910126c53738e337712e5bb9a (patch) | |
| tree | b7aa9899ced985de5e89d3f70b4ef79abb3c61f4 /src/declarative/util/qdeclarativestateoperations.cpp | |
| parent | 96d5029126707771a3b956e6db0391ae7d619853 (diff) | |
| download | Qt-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/qdeclarativestateoperations.cpp')
| -rw-r--r-- | src/declarative/util/qdeclarativestateoperations.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp index efef52d..b11c0c2 100644 --- a/src/declarative/util/qdeclarativestateoperations.cpp +++ b/src/declarative/util/qdeclarativestateoperations.cpp @@ -659,7 +659,7 @@ void QDeclarativeStateChangeScript::execute(Reason) Q_D(QDeclarativeStateChangeScript); const QString &script = d->script.script(); if (!script.isEmpty()) { - QDeclarativeExpression expr(d->script.context(), script, d->script.scopeObject()); + QDeclarativeExpression expr(d->script.context(), d->script.scopeObject(), script); QDeclarativeData *ddata = QDeclarativeData::get(this); if (ddata && ddata->outerContext && !ddata->outerContext->url.isEmpty()) expr.setSourceLocation(ddata->outerContext->url.toString(), ddata->lineNumber); |