diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-20 01:01:00 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-02-20 09:51:12 +0100 |
| commit | 035f934d7a798e97bf0213a5d42a3d511132f03d (patch) | |
| tree | 89aa6efdc86864ce479cddca6b9c4ba523c2754a /config_help.txt | |
| parent | f4cc23cffbe3005f0a522cac938695e87ecd6407 (diff) | |
| parent | da4ab444ffac37514435364d4d3f0ad59d4f9bc3 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
Added tests/auto/testlib/selftests/expected_crashes_5.txt to work
round the output of the crashes test (which exercises UB, see
QTBUG-73903) being truncated on one test platform.
Change-Id: I9cd3f2639b4e50c3c4513e14629a40bdca8f8273
Diffstat (limited to 'config_help.txt')
| -rw-r--r-- | config_help.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config_help.txt b/config_help.txt index 606f40385e..18f66c7931 100644 --- a/config_help.txt +++ b/config_help.txt @@ -167,7 +167,8 @@ Build options: -pch ................. Use precompiled headers [auto] -ltcg ................ Use Link Time Code Generation [no] - -use-gold-linker ..... Use the GNU gold linker [auto] + -linker [bfd,gold,lld] Force use of the GNU ld, GNU gold or LLVM/LLD linker + instead of default one (GCC only) -incredibuild-xge .... Use the IncrediBuild XGE [no] (Windows only) -ccache .............. Use the ccache compiler cache [no] (Unix only) -make-tool <tool> .... Use <tool> to build qmake [nmake] (Windows only) |