aboutsummaryrefslogtreecommitdiffstats
path: root/src/3rdparty/masm/masm-defs.pri
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2013-06-25 16:07:41 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-06-26 15:45:52 +0200
commit972094c109febebfb0376970bfc742d4200bcd14 (patch)
tree43e478c099bb5bafec5779a20d951627beae58ff /src/3rdparty/masm/masm-defs.pri
parent8df7aa9d15095641c729aafb694bd553e63b8f4f (diff)
Disable the JIT on Windows/AMD64 as well as on iOS
Change-Id: I7402981caa2f73fd0712975e657488a4065f403f Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/3rdparty/masm/masm-defs.pri')
-rw-r--r--src/3rdparty/masm/masm-defs.pri6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/masm/masm-defs.pri b/src/3rdparty/masm/masm-defs.pri
index 8265bba617..255c490fd7 100644
--- a/src/3rdparty/masm/masm-defs.pri
+++ b/src/3rdparty/masm/masm-defs.pri
@@ -1,4 +1,4 @@
-DEFINES += V4_ENABLE_JIT
+!ios:!if(win*:isEqual(QT_ARCH, "x86_64")): DEFINES += V4_ENABLE_JIT
DEFINES += WTF_EXPORT_PRIVATE="" JS_EXPORT_PRIVATE=""
@@ -6,11 +6,11 @@ win*: DEFINES += NOMINMAX
DEFINES += ENABLE_LLINT=0
DEFINES += ENABLE_DFG_JIT=0
-DEFINES += ENABLE_JIT=1
DEFINES += ENABLE_JIT_CONSTANT_BLINDING=0
DEFINES += ENABLE_ASSEMBLER=1
-DEFINES += ENABLE_YARR_JIT=1
DEFINES += BUILDING_QT__
+DEFINES += ENABLE_YARR_JIT=1
+DEFINES += ENABLE_JIT=1
INCLUDEPATH += $$PWD/jit
INCLUDEPATH += $$PWD/assembler