diff options
| author |   Liang Qi <liang.qi@qt.io> | 2019-04-24 09:52:30 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-04-24 09:52:30 +0200 |
| commit | dc373186841802f2dd17fcd243efdeca7d5433e9 (patch) | |
| tree | 4fff0a3366b63db97ca5a8b04a220bb0b8c56450 /config_help.txt | |
| parent | libinput: add support for LIBINPUT_EVENT_POINTER_MOTION_ABSOLUTE (diff) | |
| parent | Merge remote-tracking branch 'origin/5.12' into 5.13 (diff) | |
| download | qtbase-dc373186841802f2dd17fcd243efdeca7d5433e9.tar.xz qtbase-dc373186841802f2dd17fcd243efdeca7d5433e9.zip | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/gui/util/qshaderformat.cpp
src/gui/util/qshaderformat_p.h
src/widgets/graphicsview/qgraphicsitem_p.h
Change-Id: Idafd88eb9a0a15b4af29f6143d009c1ec8ceecca
Diffstat (limited to 'config_help.txt')
| -rw-r--r-- | config_help.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config_help.txt b/config_help.txt index 77a333c89a..5334f9618d 100644 --- a/config_help.txt +++ b/config_help.txt @@ -139,8 +139,8 @@ Build options: -coverage {trace-pc-guard} Add code coverage instrumentation (Clang only) - -c++std <edition> .... Select C++ standard <edition> [c++1z/c++14/c++11] - (Not supported with MSVC) + -c++std <edition> .... Select C++ standard <edition> [c++2a/c++17/c++14/c++11] + (Not supported with MSVC 2015) -sse2 ................ Use SSE2 instructions [auto] -sse3/-ssse3/-sse4.1/-sse4.2/-avx/-avx2/-avx512 |