diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-12-05 12:42:41 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-12-09 14:01:57 +0000 |
| commit | 82ee8341fba141e2e1e44948d2161a694add1584 (patch) | |
| tree | 2e23b8101e996a5f462575105be2864a50b3db33 /src/qml/qml/qqmlexpression.cpp | |
| parent | bf661342652b02177fc1a5cd29195a443dac5bc1 (diff) | |
Get rid of FunctionObject::createQmlFunction
Instead, simply create a QmlContext, and setup the bindings with
the QV4::Function itself.
Change-Id: I9db93b15112e43a6d5e275d126fb20f9c8833e8f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlexpression.cpp')
| -rw-r--r-- | src/qml/qml/qqmlexpression.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlexpression.cpp b/src/qml/qml/qqmlexpression.cpp index 2a9d0a7b90..94b1eaab52 100644 --- a/src/qml/qml/qqmlexpression.cpp +++ b/src/qml/qml/qqmlexpression.cpp @@ -76,8 +76,8 @@ void QQmlExpressionPrivate::init(QQmlContextData *ctxt, QV4::Function *runtimeFu expressionFunctionValid = true; QV4::ExecutionEngine *engine = QQmlEnginePrivate::getV4Engine(ctxt->engine); QV4::Scope scope(engine); - QV4::ScopedFunctionObject f(scope, QV4::FunctionObject::createQmlFunction(ctxt, me, runtimeFunction)); - setFunctionObject(f); + QV4::Scoped<QV4::QmlContext> qmlContext(scope, QV4::QmlContext::create(engine->rootContext(), ctxt, me)); + setupFunction(qmlContext, runtimeFunction); QQmlJavaScriptExpression::setContext(ctxt); setScopeObject(me); |