diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-21 13:45:19 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-21 13:45:19 +0100 |
| commit | 2bb2ebef4c86c588c3041569ffb090041ffc6b04 (patch) | |
| tree | 83adca879e20d3f4bd4d93053b0078763dacae49 | |
| parent | eec790c8c699d859617712a77b224750a85a93ad (diff) | |
| parent | ec17c3d029f608405252eca20e72b69e58e42b2c (diff) | |
| download | qtscript-2bb2ebef4c86c588c3041569ffb090041ffc6b04.tar.gz | |
Merge remote-tracking branch 'origin/5.4.0' into 5.4
Change-Id: I810e40844951f00e28c74d58c3cd727c455bfaea
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri index 6ee0aed..ec27eeb 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri +++ b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri @@ -56,6 +56,9 @@ contains(JAVASCRIPTCORE_JIT,no) { DEFINES+=ENABLE_YARR=0 } +# YARR_JIT has known issues on mingw 64 bit, see QTBUG-40814 +mingw:equals(QT_ARCH, x86_64): DEFINES+=ENABLE_YARR_JIT=0 + # Rules when JIT enabled (not disabled) !contains(DEFINES, ENABLE_JIT=0) { linux*-g++*:greaterThan(QT_GCC_MAJOR_VERSION,3):greaterThan(QT_GCC_MINOR_VERSION,0) { |