From ff650e625241375b1a40a1f11f53a7f9b0bac348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Thu, 29 Sep 2022 14:25:54 +0200 Subject: [PATCH] WindowsKeyMapper: Fix unsigned/signed mismatch error error C2220: the following warning is treated as an error warning C4018: '>': signed/unsigned mismatch Change-Id: I4ba59f3aa6bbd7b37fe469e6271df207a7d11c99 Reviewed-by: Friedemann Kleint Reviewed-by: Timur Pocheptsov (cherry picked from commit 9e7f91781d41ba588efac695c74e5304ec15625d) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/platforms/windows/qwindowskeymapper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/platforms/windows/qwindowskeymapper.cpp b/src/plugins/platforms/windows/qwindowskeymapper.cpp index 006396d92a0..e14ad880da6 100644 --- a/src/plugins/platforms/windows/qwindowskeymapper.cpp +++ b/src/plugins/platforms/windows/qwindowskeymapper.cpp @@ -1388,7 +1388,7 @@ QList QWindowsKeyMapper::possibleKeys(const QKeyEvent *e) const // Shift+9 over Alt + Shift + 9) resulting in more missing modifiers. if (it == result.end()) result << matchedKey; - else if (missingMods > (*it & Qt::KeyboardModifierMask)) + else if (missingMods > Qt::KeyboardModifiers(*it & Qt::KeyboardModifierMask)) *it = matchedKey; } }