From f514fba45b205ac47bd2ac47005b53139d672285 Mon Sep 17 00:00:00 2001 From: Lu YaNing Date: Wed, 8 Nov 2023 09:45:32 +0800 Subject: [PATCH] QXkbCommon: Use isKeypad() to replace duplicate logic This amends 298c9509129cf039a1da75d5682cbe273a341590 . Pick-to: 6.5 Change-Id: I44696464817d6d3f6b1b3a7d005334805fb1cc38 Reviewed-by: Liang Qi (cherry picked from commit c524ca342b0a00208eb2cdbe929276bc9785eb6b) Reviewed-by: Qt Cherry-pick Bot --- src/gui/platform/unix/qxkbcommon.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/platform/unix/qxkbcommon.cpp b/src/gui/platform/unix/qxkbcommon.cpp index 394407e4039..43758de9c5f 100644 --- a/src/gui/platform/unix/qxkbcommon.cpp +++ b/src/gui/platform/unix/qxkbcommon.cpp @@ -581,7 +581,7 @@ Qt::KeyboardModifiers QXkbCommon::modifiers(struct xkb_state *state, xkb_keysym_ if (xkb_state_mod_name_is_active(state, XKB_MOD_NAME_LOGO, XKB_STATE_MODS_EFFECTIVE) > 0) modifiers |= Qt::MetaModifier; - if (keysym >= XKB_KEY_KP_Space && keysym <= XKB_KEY_KP_9) + if (isKeypad(keysym)) modifiers |= Qt::KeypadModifier; return modifiers;