summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2009-10-07 01:06:35 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2009-10-07 01:06:35 (GMT)
commit9e2776a4088bc3153eccc00943013a2f5097443e (patch)
tree31b6802f18f552cd7c2b489d5033c970b52962a7 /src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
parent95821d745a60e60422294dd718cbed5678ef5f1f (diff)
parentafcad4b4393b4f7187737fb8b4e528887b07d943 (diff)
downloadQt-9e2776a4088bc3153eccc00943013a2f5097443e.zip
Qt-9e2776a4088bc3153eccc00943013a2f5097443e.tar.gz
Qt-9e2776a4088bc3153eccc00943013a2f5097443e.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri')
-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-* {