summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2009-10-05 14:45:38 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2009-10-06 14:04:44 (GMT)
commit8037c03174124bc136900c88254d118ab48b010f (patch)
tree7b17da711dee6eaac186250ec09fc4a6eee0e10e /src/3rdparty/webkit
parent7cbcf8e8ef91636de1727d5bd6294a9f07c66804 (diff)
downloadQt-8037c03174124bc136900c88254d118ab48b010f.zip
Qt-8037c03174124bc136900c88254d118ab48b010f.tar.gz
Qt-8037c03174124bc136900c88254d118ab48b010f.tar.bz2
Needed to set ENABLE_YARR_JIT to not compile MacroAssembler.cpp
Reviewed-by:Simon Hausmann <simon.hausmann@nokia.com>
Diffstat (limited to 'src/3rdparty/webkit')
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
index d8b6f4b..2b08980 100644
--- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
+++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
@@ -36,8 +36,14 @@ GENERATED_SOURCES_DIR_SLASH = $${GENERATED_SOURCES_DIR}$${QMAKE_DIR_SEP}
win32-* {
LIBS += -lwinmm
}
-contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1
-contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0
+contains(JAVASCRIPTCORE_JIT,yes) {
+ DEFINES+=ENABLE_JIT=1
+ DEFINES+=ENABLE_YARR_JIT=1
+}
+contains(JAVASCRIPTCORE_JIT,no) {
+ DEFINES+=ENABLE_JIT=0
+ DEFINES+=ENABLE_YARR_JIT=0
+}
# In debug mode JIT disabled until crash fixed
win32-* {