diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-12-04 09:58:43 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-12-04 09:58:43 +0100 |
| commit | 5d5c00c67682bce105197b659687fd1fee8f60cf (patch) | |
| tree | 686e41dc3ea121235fb73afb9157ed603f1bfeff /config_help.txt | |
| parent | f213e818f03d35cb82e3daf187415197fd156f8e (diff) | |
| parent | b82559244e2dc03f1ceff66bb67630df4300dc7c (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/gui/painting/qdrawhelper.cpp
Change-Id: I4916e07b635e1d3830e9b46ef7914f99bec3098e
Diffstat (limited to 'config_help.txt')
| -rw-r--r-- | config_help.txt | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/config_help.txt b/config_help.txt index 4778ddb336..2d4664f4a9 100644 --- a/config_help.txt +++ b/config_help.txt @@ -306,10 +306,7 @@ Gui, printing, widget options: -mtdev ............. Enable mtdev support [auto] -tslib ............. Enable tslib support [auto] -xcb-xinput ........ Enable XInput2 support [auto] - -xkbcommon-x11 ..... Select xkbcommon used in combination with xcb - [system/qt/no] - -xkbcommon-evdev ... Enable X-less xkbcommon in combination with libinput - [auto] + -xkbcommon ......... Enable key mapping support [auto] Image formats: -gif ............... Enable reading support for GIF [auto] |