diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-28 14:20:17 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-28 14:20:17 +0100 |
| commit | 762971738c1857ab83ff68d0429bcca066e2dfb2 (patch) | |
| tree | 4dbe4fba48b46d63e5a0b145bce81138209ce47c /qapi-schema.json | |
| parent | 871a0f7ad2b9560c5f7d640125c5be95ca23ca7f (diff) | |
| parent | ef58430d5daeac4c18e4072f5860e25700aa8af6 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20170728-pull-request' into staging
ui: more keymap fixes for 2.10
# gpg: Signature made Fri 28 Jul 2017 13:59:01 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-20170728-pull-request:
ui: add pause key to linux_to_qcode
ui: drop ac_search and ac_stop
ui: correctly detect spice PAUSE scancode sequence
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi-schema.json')
| -rw-r--r-- | qapi-schema.json | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/qapi-schema.json b/qapi-schema.json index dcc12c83a9..c96f0a26f6 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -4856,11 +4856,9 @@ # @mail: since 2.10 # @calculator: since 2.10 # @computer: since 2.10 -# @ac_search: since 2.10 # @ac_home: since 2.10 # @ac_back: since 2.10 # @ac_forward: since 2.10 -# @ac_stop: since 2.10 # @ac_refresh: since 2.10 # @ac_bookmarks: since 2.10 # altgr, altgr_r: dropped in 2.10 @@ -4890,8 +4888,7 @@ 'audionext', 'audioprev', 'audiostop', 'audioplay', 'audiomute', 'volumeup', 'volumedown', 'mediaselect', 'mail', 'calculator', 'computer', - 'ac_search', 'ac_home', 'ac_back', 'ac_forward', 'ac_stop', - 'ac_refresh', 'ac_bookmarks' ] } + 'ac_home', 'ac_back', 'ac_forward', 'ac_refresh', 'ac_bookmarks' ] } ## # @KeyValue: |