diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-27 18:28:57 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-27 18:28:57 +0100 |
| commit | 693d8f8172e35d6fca3080538e05862071c4de8b (patch) | |
| tree | 8ccc4dd79f8cef58b78a71a3180ee950764be4b6 | |
| parent | 8d3aa63d533fe5a416554be276e60de48f043516 (diff) | |
| parent | 2bb2ebef4c86c588c3041569ffb090041ffc6b04 (diff) | |
| download | qtscript-693d8f8172e35d6fca3080538e05862071c4de8b.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I80f2ea26633997a728eab832fe53ee9f69daf2bc
| -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) { |