summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/JavaScriptCore
diff options
context:
space:
mode:
authorSami Merilä <sami.merila@nokia.com>2009-10-02 13:21:34 (GMT)
committerSami Merilä <sami.merila@nokia.com>2009-10-02 13:21:34 (GMT)
commit1ffaf40f5cffca57d7e116d61935ccd034239222 (patch)
treef8d9c73bb0a1ede03418415163b957fcf060e6f6 /src/3rdparty/webkit/JavaScriptCore
parentc206ea53ebac0436bad0c00c1e340f23efb3aa16 (diff)
parenta841c496bb7ca54fef01f9785e0d91991172b182 (diff)
downloadQt-1ffaf40f5cffca57d7e116d61935ccd034239222.zip
Qt-1ffaf40f5cffca57d7e116d61935ccd034239222.tar.gz
Qt-1ffaf40f5cffca57d7e116d61935ccd034239222.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.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-* {