From: Peter Maydell Date: Fri, 25 Jun 2021 08:10:37 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/ui-20210624-pull-request' into... X-Git-Tag: v6.1.0-rc0~60 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e0da9171e02f4534124b9a9e07333382b38376c6;p=users%2Fdwmw2%2Fqemu.git Merge remote-tracking branch 'remotes/kraxel/tags/ui-20210624-pull-request' into staging ui: better cocoa integration (ui info + clipboard). ui: add lang1+lang2 keys, fixes, doc updates. # gpg: Signature made Thu 24 Jun 2021 09:32:36 BST # gpg: using RSA key A0328CFFB93A17A79901FE7D4CB6D8EED3E87138 # gpg: Good signature from "Gerd Hoffmann (work) " [full] # gpg: aka "Gerd Hoffmann " [full] # gpg: aka "Gerd Hoffmann (private) " [full] # Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138 * remotes/kraxel/tags/ui-20210624-pull-request: ui: Make the DisplayType enum entries conditional Add display suboptions to man pages input: Add lang1 and lang2 to QKeyCode ui/cocoa: Add clipboard support ui/cocoa: Set UI information Signed-off-by: Peter Maydell --- e0da9171e02f4534124b9a9e07333382b38376c6