diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:10:15 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:10:15 +0100 |
| commit | 3b5c0bc0780f1749fed7c07bd8b691400a0282b7 (patch) | |
| tree | 1022f5553ad5a0aca9b5f3b49ca38a01c2329d20 /src/3rdparty/xkbcommon/xkbcommon/xkbcommon-keysyms.h | |
| parent | c79918733a194ebbe5a2fe1617c884659f3e4b9f (diff) | |
| parent | 21f1738a94fc8544ece04b3b1ee03a11986fe59b (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/gui/image/qjpeghandler.cpp
Change-Id: I9db3acea7d5c82f5da679c8eaeb29431136665f0
Diffstat (limited to 'src/3rdparty/xkbcommon/xkbcommon/xkbcommon-keysyms.h')
| -rw-r--r-- | src/3rdparty/xkbcommon/xkbcommon/xkbcommon-keysyms.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/3rdparty/xkbcommon/xkbcommon/xkbcommon-keysyms.h b/src/3rdparty/xkbcommon/xkbcommon/xkbcommon-keysyms.h index 253ea59ceb..69c582e45f 100644 --- a/src/3rdparty/xkbcommon/xkbcommon/xkbcommon-keysyms.h +++ b/src/3rdparty/xkbcommon/xkbcommon/xkbcommon-keysyms.h @@ -418,6 +418,12 @@ SOFTWARE. #define XKB_KEY_dead_belowcomma 0xfe6e #define XKB_KEY_dead_currency 0xfe6f +/* extra dead elements for German T3 layout */ +#define XKB_KEY_dead_lowline 0xfe90 +#define XKB_KEY_dead_aboveverticalline 0xfe91 +#define XKB_KEY_dead_belowverticalline 0xfe92 +#define XKB_KEY_dead_longsolidusoverlay 0xfe93 + /* dead vowels for universal syllable entry */ #define XKB_KEY_dead_a 0xfe80 #define XKB_KEY_dead_A 0xfe81 @@ -2652,6 +2658,8 @@ SOFTWARE. #define XKB_KEY_XF86TouchpadOn 0x1008FFB0 /* The touchpad got switched on */ #define XKB_KEY_XF86TouchpadOff 0x1008FFB1 /* The touchpad got switched off */ +#define XKB_KEY_XF86AudioMicMute 0x1008FFB2 /* Mute the Mic from the system */ + /* Keys for special action keys (hot keys) */ /* Virtual terminals on some operating systems */ #define XKB_KEY_XF86Switch_VT_1 0x1008FE01 |