summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/JavaScriptCore
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-10-02 10:36:37 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-10-02 10:36:37 (GMT)
commitf3e22526cb8464881d75cca33440fdb5425b2f29 (patch)
tree0509af84c53096554e64326785e9e150c519aaa3 /src/3rdparty/webkit/JavaScriptCore
parentc6eb19412f1d0ffc1d5be1c7451e779c0286e013 (diff)
parentaf6a5c509390ee6a1b5022d81fd4660999550332 (diff)
downloadQt-f3e22526cb8464881d75cca33440fdb5425b2f29.zip
Qt-f3e22526cb8464881d75cca33440fdb5425b2f29.tar.gz
Qt-f3e22526cb8464881d75cca33440fdb5425b2f29.tar.bz2
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore')
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
index 73791e0..d8b6f4b 100644
--- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
+++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
@@ -36,6 +36,8 @@ 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
# In debug mode JIT disabled until crash fixed
win32-* {