diff options
| author | Shane Kearns <shane.kearns@sosco.com> | 2009-10-06 16:15:21 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@sosco.com> | 2009-10-06 16:15:21 (GMT) |
| commit | 90ebbabf0b2a6b3fe008fb8d98da0df6a12a720c (patch) | |
| tree | a7b3f64a958fdae3378417eac93d6fc7346e1d56 /src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri | |
| parent | 28cdb974cce58111a19e8691f4dd929a5c9f74ea (diff) | |
| parent | 092c773b95b1f126d36ab7c918fb098ddad6cae3 (diff) | |
| download | Qt-90ebbabf0b2a6b3fe008fb8d98da0df6a12a720c.zip Qt-90ebbabf0b2a6b3fe008fb8d98da0df6a12a720c.tar.gz Qt-90ebbabf0b2a6b3fe008fb8d98da0df6a12a720c.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/JavaScriptCore.pri')
| -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-* { |