diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2009-09-30 13:48:07 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2009-10-02 07:19:43 (GMT) |
| commit | ea6d4e94c802f648e296eec0bde1661728d82024 (patch) | |
| tree | 4008d96c61c20f8ac376c294ad54f352916f1f79 /src | |
| parent | 7ea326d796a6d2ecb13b961c576c82a797d84706 (diff) | |
| download | Qt-ea6d4e94c802f648e296eec0bde1661728d82024.zip Qt-ea6d4e94c802f648e296eec0bde1661728d82024.tar.gz Qt-ea6d4e94c802f648e296eec0bde1661728d82024.tar.bz2 | |
Add configure flags to force turning on or off JavaScriptCore JIT
Also add configure test to see if arm toolchain can compile
JavaScript JIT
Task-number:QTBUG-4632
Reviewed-by:Simon Hausmann <simon.hausmann@nokia.com>,
Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri | 3 | ||||
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri index 8483469..965f3d6 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri +++ b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri @@ -37,6 +37,9 @@ 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-* { CONFIG(debug):!contains(DEFINES, ENABLE_JIT=1): DEFINES+=ENABLE_JIT=0 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-* { |