diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2011-08-29 15:06:14 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-29 08:29:24 +0200 |
commit | f29bfda2e609f00fad46160495017168094eff7b (patch) | |
tree | 8378dfb9643e96cbfa1c829c315116af6be0cf20 /src/declarative/qml/qdeclarativeexpression.cpp | |
parent | 438639f9c40311b51a57b501428d2650f21615cf (diff) |
Use the optimized QDeclarativeExpression constructor where possible.
Pass in the QDeclarativeScriptString directly, to make use of the
precompiled binding. Also does some minor cleanup of the related
internal implementation.
Change-Id: I4b199298c9da3ee11c51c9c98b384c8324f62c26
Reviewed-on: http://codereview.qt.nokia.com/3696
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativeexpression.cpp')
-rw-r--r-- | src/declarative/qml/qdeclarativeexpression.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativeexpression.cpp b/src/declarative/qml/qdeclarativeexpression.cpp index 8806996bd4..a24d46914c 100644 --- a/src/declarative/qml/qdeclarativeexpression.cpp +++ b/src/declarative/qml/qdeclarativeexpression.cpp @@ -242,7 +242,7 @@ QDeclarativeExpression::QDeclarativeExpression(const QDeclarativeScriptString &s } else { QDeclarativeContextData *ctxtdata = QDeclarativeContextData::get(script.context()); - QDeclarativeEnginePrivate *engine = QDeclarativeEnginePrivate::get(qmlEngine(script.scopeObject())); + QDeclarativeEnginePrivate *engine = QDeclarativeEnginePrivate::get(script.context()->engine()); QDeclarativeCompiledData *cdata = 0; QDeclarativeTypeData *typeData = 0; if (engine && ctxtdata && !ctxtdata->url.isEmpty()) { @@ -251,7 +251,7 @@ QDeclarativeExpression::QDeclarativeExpression(const QDeclarativeScriptString &s } if (cdata) - d->init(ctxtdata, cdata->primitives.at(id), cdata, script.scopeObject(), + d->init(ctxtdata, cdata->primitives.at(id), true, script.scopeObject(), cdata->name, script.d.data()->lineNumber); else defaultConstruction = true; |