From a25054d33db42e6fc09ef124fcdc363ce1588923 Mon Sep 17 00:00:00 2001 From: Inho Lee Date: Thu, 15 May 2025 12:39:40 +0200 Subject: [PATCH] wayland keyboard: suppress a warning for NO_KEYMAP Some compositor calls send_keymap with WL_KEYBOARD_KEYMAP_FORMAT_NO_KEYMAP and it repeatedly makes "unknown keymap format" warnings. Moved from 7f78afdc9657d2393e98a8244bafc076b569d845 Change-Id: I92564fbe579bac5a56f0a842ac1b065330343ab5 Reviewed-by: Liang Qi --- src/plugins/platforms/wayland/qwaylandinputdevice.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/plugins/platforms/wayland/qwaylandinputdevice.cpp b/src/plugins/platforms/wayland/qwaylandinputdevice.cpp index fea7e77414c..f97a28a0cf4 100644 --- a/src/plugins/platforms/wayland/qwaylandinputdevice.cpp +++ b/src/plugins/platforms/wayland/qwaylandinputdevice.cpp @@ -1199,6 +1199,9 @@ void QWaylandInputDevice::Keyboard::keyboard_keymap(uint32_t format, int32_t fd, { mKeymapFormat = format; #if QT_CONFIG(xkbcommon) + if (format == WL_KEYBOARD_KEYMAP_FORMAT_NO_KEYMAP) + return; + if (format != WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1) { qCWarning(lcQpaWayland) << "unknown keymap format:" << format; close(fd);