summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2009-11-05 04:17:49 (GMT)
committerBea Lam <bea.lam@nokia.com>2009-11-05 04:17:49 (GMT)
commitc4bc9a635bf0fd42e80e570909e204ae24b303b2 (patch)
treef31b37dc4aec0de9aba28b7f0a734336fd0812dc /src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
parent3babe49011d363aaaabafb70bfb0626217ec8959 (diff)
parentd39ec85b7e5d8702c2888cdad4ccdae72531c199 (diff)
downloadQt-c4bc9a635bf0fd42e80e570909e204ae24b303b2.zip
Qt-c4bc9a635bf0fd42e80e570909e204ae24b303b2.tar.gz
Qt-c4bc9a635bf0fd42e80e570909e204ae24b303b2.tar.bz2
Merge branch 'kinetic-declarativeui' of 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.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 89c483e..eb26664 100644
--- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
+++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
@@ -39,10 +39,12 @@ win32-* {
contains(JAVASCRIPTCORE_JIT,yes) {
DEFINES+=ENABLE_JIT=1
DEFINES+=ENABLE_YARR_JIT=1
+ DEFINES+=ENABLE_YARR=1
}
contains(JAVASCRIPTCORE_JIT,no) {
DEFINES+=ENABLE_JIT=0
DEFINES+=ENABLE_YARR_JIT=0
+ DEFINES+=ENABLE_YARR=0
}
# In debug mode JIT disabled until crash fixed