diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-10-06 15:00:08 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-10-06 15:00:08 (GMT) |
| commit | d17a315a082a8cb5d7f3f5ae47dabbe721982e2c (patch) | |
| tree | 42165b4a3639be226100b7f40f7544c13db46fa8 /src/3rdparty/webkit/JavaScriptCore | |
| parent | 54645071fad98b46a44d88b50095dc21ff63fff6 (diff) | |
| parent | fa35247d31bd35d72c307f4a6a231400aade0c0b (diff) | |
| download | Qt-d17a315a082a8cb5d7f3f5ae47dabbe721982e2c.zip Qt-d17a315a082a8cb5d7f3f5ae47dabbe721982e2c.tar.gz Qt-d17a315a082a8cb5d7f3f5ae47dabbe721982e2c.tar.bz2 | |
Merge commit 'qt/4.6' into mmfphonon
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri | 10 |
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-* { |