summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKent Hansen <kent.hansen@nokia.com>2009-11-30 10:33:39 (GMT)
committerKent Hansen <kent.hansen@nokia.com>2009-11-30 10:48:16 (GMT)
commit84794dee63d9f90fc3e2d579644a6a2835513e9e (patch)
tree53022e17fb2f116e8ce4a33ccd837c7ad5417cc7 /src
parentbdd34f907b919ea0742f28ba25b6a3c1ebe97e86 (diff)
downloadQt-84794dee63d9f90fc3e2d579644a6a2835513e9e.zip
Qt-84794dee63d9f90fc3e2d579644a6a2835513e9e.tar.gz
Qt-84794dee63d9f90fc3e2d579644a6a2835513e9e.tar.bz2
Enable YARR when YARR_JIT is enabled
Import fix for https://bugs.webkit.org/show_bug.cgi?id=30730 The fix was already applied for src/3rdparty/webkit but not for src/3rdparty/javascriptcore. Task-number: QTBUG-6311 Reviewed-by: Simon Hausmann
Diffstat (limited to 'src')
-rw-r--r--src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
index 28328e7..a6fb2f8 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
+++ b/src/3rdparty/javascriptcore/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