Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180410-pull-request' into...
commitdf6378eb0e6cfd58a22a1c3ff8fa4a9039f1eaa8
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 10 Apr 2018 13:04:27 +0000 (10 14:04 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 10 Apr 2018 13:04:27 +0000 (10 14:04 +0100)
treec2b5757d53b6c108d5974501101ec8c7085fd00f
parentdaf6b59be8c703264765a533bc63421caef95225
parentc6093a05d6a84d2144bb6462cf20e907eddf8aeb
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180410-pull-request' into staging

configure: don't warn on old sdl/gtk versions if disabled.
keymap + gtk fixes.

# gpg: Signature made Tue 10 Apr 2018 10:23:37 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-20180410-pull-request:
  configure: don't warn SDL abi if disabled
  configure: don't warn GTK if disabled
  gtk: drop pointless code from gd_window_close
  ui: fix keymap detection under Xwayland

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>