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/qqmlscript.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/qqmlscript.cpp')
| -rw-r--r-- | src/qml/qml/qqmlscript.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlscript.cpp b/src/qml/qml/qqmlscript.cpp index 88603ac2a8..4c1a1f7be5 100644 --- a/src/qml/qml/qqmlscript.cpp +++ b/src/qml/qml/qqmlscript.cpp @@ -202,7 +202,7 @@ QQmlScript::Object::DynamicSignal::DynamicSignal() } QQmlScript::Object::DynamicSlot::DynamicSlot() -: nextSlot(0), nameIndex(-1) +: funcDecl(0), nextSlot(0), nameIndex(-1) { } @@ -1284,9 +1284,8 @@ bool ProcessAST::visit(AST::UiSourceElement *node) AST::SourceLocation loc = funDecl->rparenToken; loc.offset = loc.end(); loc.startColumn += 1; - QString body = textAt(loc, funDecl->rbraceToken); slot->name = funDecl->name; - slot->body = body; + slot->funcDecl = funDecl; obj->dynamicSlots.append(slot); } else { |