diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-09-20 16:47:57 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-09-20 16:48:32 +0200 |
| commit | 57919fe200c0ecbd4cf1873ed2c6c95732c2dd3b (patch) | |
| tree | 048fa6b5f80987b7765252204b77bc3618bbe33f /src/qml/compiler/qv4isel_moth_p.h | |
| parent | 3ea14e269bec15db8a95dc4b610a5f063a67e1a2 (diff) | |
| parent | 3123a22ae66016a0d9cd600dbb6f636fd29fc312 (diff) | |
Merge branch 'wip/v4' of qtdeclarative into dev
This brings in the infrastructure for the new compilation of QML and JS
in the loader thread and the new VME replacement for creating objects
in the GUI thread.
Change-Id: Ib8127c10f5cb3ad238e57469723d031ab765a79b
Diffstat (limited to 'src/qml/compiler/qv4isel_moth_p.h')
| -rw-r--r-- | src/qml/compiler/qv4isel_moth_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/compiler/qv4isel_moth_p.h b/src/qml/compiler/qv4isel_moth_p.h index df6095db5b..ee0b7276cb 100644 --- a/src/qml/compiler/qv4isel_moth_p.h +++ b/src/qml/compiler/qv4isel_moth_p.h @@ -71,7 +71,7 @@ class Q_QML_EXPORT InstructionSelection: public EvalInstructionSelection { public: - InstructionSelection(QV4::ExecutableAllocator *execAllocator, V4IR::Module *module); + InstructionSelection(QV4::ExecutableAllocator *execAllocator, V4IR::Module *module, QV4::Compiler::JSUnitGenerator *jsGenerator); ~InstructionSelection(); virtual void run(int functionIndex); @@ -188,8 +188,8 @@ class Q_QML_EXPORT ISelFactory: public EvalISelFactory { public: virtual ~ISelFactory() {} - virtual EvalInstructionSelection *create(QV4::ExecutableAllocator *execAllocator, V4IR::Module *module) - { return new InstructionSelection(execAllocator, module); } + virtual EvalInstructionSelection *create(QV4::ExecutableAllocator *execAllocator, V4IR::Module *module, QV4::Compiler::JSUnitGenerator *jsGenerator) + { return new InstructionSelection(execAllocator, module, jsGenerator); } virtual bool jitCompileRegexps() const { return false; } }; |