diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-18 10:34:44 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-18 10:34:59 +0100 |
| commit | 8b00fdada15a53c7764472435cffe04f22c3522f (patch) | |
| tree | 31756dd9b97a6be3ab5ee58c70f6c34b94024e10 /Tools | |
| parent | 8e72001f4b51b4695065842882aa5898a7340ecd (diff) | |
| parent | 1ee472207c63905ab4455e676ee3ffd3263ab2cb (diff) | |
| download | qtwebkit-8b00fdada15a53c7764472435cffe04f22c3522f.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I0cf3a38a8cccbfdeb7942b712d3d878441601c87
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/qmake/mkspecs/features/default_pre.prf | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf index bc173aac1..7e386b5c3 100644 --- a/Tools/qmake/mkspecs/features/default_pre.prf +++ b/Tools/qmake/mkspecs/features/default_pre.prf @@ -97,6 +97,9 @@ contains(QT_CONFIG, c++11): CONFIG += c++11 # Limit the creation of thin archives to Linux, since only GNU's ar supports it. !debug_and_release:linux: CONFIG += gnu_thin_archives +# The Gold linker breaks transition between JIT and LLInt due to thumb-state mismatch. +gcc:isEqual(QT_ARCH, "arm"): CONFIG -= use_gold_linker + # Pick up Qt's defaults for debug/release/debug_and_release if(win32|mac):!macx-xcode { contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release |