| Message ID | 20231214-options-v1-1-113f347b0e3f@daynix.com |
|---|---|
| State | New |
| Headers | show |
| Series | qemu-options: Improve -display cocoa documentation | expand |
On 14/12/23 07:31, Akihiko Odaki wrote: > Apparently the help entries were not merged when the patches got in. > > Fixes: f844cdb99714 ("ui/cocoa: capture all keys and combos when mouse is grabbed") > Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com> > --- > qemu-options.hx | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
diff --git a/qemu-options.hx b/qemu-options.hx index 42fd09e4de96..28aa26ceb508 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2087,6 +2087,7 @@ DEF("display", HAS_ARG, QEMU_OPTION_display, #endif #if defined(CONFIG_COCOA) "-display cocoa[,full-grab=on|off][,swap-opt-cmd=on|off]\n" + " [,show-cursor=on|off][,left-command-key=on|off]\n" #endif #if defined(CONFIG_OPENGL) "-display egl-headless[,rendernode=<file>]\n" @@ -2094,9 +2095,6 @@ DEF("display", HAS_ARG, QEMU_OPTION_display, #if defined(CONFIG_DBUS_DISPLAY) "-display dbus[,addr=<dbusaddr>]\n" " [,gl=on|core|es|off][,rendernode=<file>]\n" -#endif -#if defined(CONFIG_COCOA) - "-display cocoa[,show-cursor=on|off][,left-command-key=on|off]\n" #endif "-display none\n" " select display backend type\n"
Apparently the help entries were not merged when the patches got in. Fixes: f844cdb99714 ("ui/cocoa: capture all keys and combos when mouse is grabbed") Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com> --- qemu-options.hx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)