diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-10-09 00:24:55 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-11 22:55:02 +0200 |
| commit | 774963f52f569e637f45d6c6079121253e54b61b (patch) | |
| tree | b007dcdbe49a90db727593d4e1966c92d4622dee /src/qml/qml/qqmlvme.cpp | |
| parent | c39393e7de5b808adbc9c5771ecca161c9660d7c (diff) | |
Compile JS functions as part of the QQmlCompiler run in the loader thread
...instead of extracting the function body as a string and compiling it in the
GUI thread.
Change-Id: I3c3108f6e35464b5581a2d8b5799e7285858ce4d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlvme.cpp')
| -rw-r--r-- | src/qml/qml/qqmlvme.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlvme.cpp b/src/qml/qml/qqmlvme.cpp index c5dfeb2956..21f7ce4cab 100644 --- a/src/qml/qml/qqmlvme.cpp +++ b/src/qml/qml/qqmlvme.cpp @@ -714,7 +714,8 @@ QObject *QQmlVME::run(QList<QQmlError> *errors, const QQmlVMEMetaData *data = (const QQmlVMEMetaData *)DATAS.at(instr.aliasData).constData(); - (void)new QQmlVMEMetaObject(target, propertyCache, data); + QV4::ExecutionContext *qmlContext = qmlBindingContext(engine, QV8Engine::getV4(engine), qmlBindingWrappers, CTXT, target, objects.count() - 1); + (void)new QQmlVMEMetaObject(target, propertyCache, data, qmlContext, COMP); QQmlData *ddata = QQmlData::get(target, true); if (ddata->propertyCache) ddata->propertyCache->release(); |