diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-27 15:27:06 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-27 15:27:06 +0100 |
| commit | e01151de165070c25a1b202e9e2392950bd7c8da (patch) | |
| tree | ed0caa6f429d5b388e9c9bacf23fd84b928291e5 /hw/char/escc.c | |
| parent | 6be37cc583454ee27587a79b6008e22c3cc1a763 (diff) | |
| parent | 7c388dbd0b2c54b3d836c23ea43e2cee38de66a4 (diff) | |
| download | focaccia-qemu-e01151de165070c25a1b202e9e2392950bd7c8da.tar.gz focaccia-qemu-e01151de165070c25a1b202e9e2392950bd7c8da.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20170727-pull-request' into staging
ui: keymap fixes for 2.10 # gpg: Signature made Thu 27 Jul 2017 15:00:06 BST # gpg: using RSA key 0x4CB6D8EED3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" # Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138 * remotes/kraxel/tags/ui-20170727-pull-request: ps2: fix sending of PAUSE/BREAK scancodes ui: drop altgr and altgr_r QKeyCodes ps2: enable multimedia keys ui: add multimedia keys ui: update keymaps ui: move qemu_input_linux_to_qcode() ui: add next and prior keysyms Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/char/escc.c')
| -rw-r--r-- | hw/char/escc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/char/escc.c b/hw/char/escc.c index 89ae9eb997..1aca564e33 100644 --- a/hw/char/escc.c +++ b/hw/char/escc.c @@ -722,7 +722,6 @@ static const uint8_t qcode_to_keycode[Q_KEY_CODE__MAX] = { [Q_KEY_CODE_SHIFT_R] = 110, [Q_KEY_CODE_ALT] = 19, [Q_KEY_CODE_ALT_R] = 13, - [Q_KEY_CODE_ALTGR] = 13, [Q_KEY_CODE_CTRL] = 76, [Q_KEY_CODE_CTRL_R] = 76, [Q_KEY_CODE_ESC] = 29, |