diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-10-16 17:18:29 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-17 11:36:32 +0200 |
| commit | 3cbc607b74a1fc410689472d8821771377fcc786 (patch) | |
| tree | 1a6343905f21b2ef4164fb1be6c91a85ec14a854 /src/qml/compiler/compiler.pri | |
| parent | a443af35591224667fd681462b3446fad834a6ef (diff) | |
Fix build on ARM in ARM mode (instead of thumb2)
We don't support the traditional ARM assembler (yet), only JIT on thumb2. In
order for us to reliably check that, we have to wait until the pre-processor
runs, which this patch achieves by moving all JIT enable/disable decisions into
qv4global_p.h
Change-Id: I7eff5b4fbf1cd26297a08dee16984ad867358113
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/compiler/compiler.pri')
| -rw-r--r-- | src/qml/compiler/compiler.pri | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/qml/compiler/compiler.pri b/src/qml/compiler/compiler.pri index 3a1af30b88..df4f5e8dc3 100644 --- a/src/qml/compiler/compiler.pri +++ b/src/qml/compiler/compiler.pri @@ -14,7 +14,8 @@ HEADERS += \ $$PWD/qv4isel_util_p.h \ $$PWD/qv4ssa_p.h \ $$PWD/qv4regalloc_p.h \ - $$PWD/qqmlcodegenerator_p.h + $$PWD/qqmlcodegenerator_p.h \ + $$PWD/qv4isel_masm_p.h SOURCES += \ $$PWD/qv4compileddata.cpp \ @@ -26,11 +27,7 @@ SOURCES += \ $$PWD/qv4jsir.cpp \ $$PWD/qv4ssa.cpp \ $$PWD/qv4regalloc.cpp \ - $$PWD/qqmlcodegenerator.cpp - -contains(DEFINES, V4_ENABLE_JIT) { - HEADERS += $$PWD/qv4isel_masm_p.h - SOURCES += $$PWD/qv4isel_masm.cpp -} + $$PWD/qqmlcodegenerator.cpp \ + $$PWD/qv4isel_masm.cpp include(../../3rdparty/masm/masm.pri) |