diff options
| author | Peter Maydell | 2018-06-14 15:04:14 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-06-14 15:04:14 +0200 |
| commit | 409c241f887a38bb7a2ac12e34d3a8d73922a9a5 (patch) | |
| tree | e1ca801582db08673758bf7159638acab73bcd10 /ui/input-keymap.c | |
| parent | Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging (diff) | |
| parent | sdl2: restore window dimensions by resize (diff) | |
| download | qemu-409c241f887a38bb7a2ac12e34d3a8d73922a9a5.tar.gz qemu-409c241f887a38bb7a2ac12e34d3a8d73922a9a5.tar.xz qemu-409c241f887a38bb7a2ac12e34d3a8d73922a9a5.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180614-pull-request' into staging
ui: bugfixes for sdl and gtk
# gpg: Signature made Thu 14 Jun 2018 09:32:45 BST
# gpg: using RSA key 4CB6D8EED3E87138
# 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-20180614-pull-request:
sdl2: restore window dimensions by resize
ui: darwin: gtk: Add missing input keymap
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/input-keymap.c')
| -rw-r--r-- | ui/input-keymap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ui/input-keymap.c b/ui/input-keymap.c index 87cc301b7a..db5ccff5ad 100644 --- a/ui/input-keymap.c +++ b/ui/input-keymap.c @@ -21,6 +21,7 @@ #include "ui/input-keymap-xorgkbd-to-qcode.c" #include "ui/input-keymap-xorgxquartz-to-qcode.c" #include "ui/input-keymap-xorgxwin-to-qcode.c" +#include "ui/input-keymap-osx-to-qcode.c" int qemu_input_linux_to_qcode(unsigned int lnx) { |