From 0c1341ed5ac478cdb5bfb8373bc71a5a292bbec6 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 11 Nov 2020 07:03:38 +0100 Subject: Windows QPA: Fix a warning about deprecated conversion of keys Use QKeyCombinaton::toCombined(). Change-Id: I829f4e88ad316a6f4f5165c1d929f2dcc83f83de Reviewed-by: Friedemann Kleint Reviewed-by: Oliver Wolff --- src/plugins/platforms/windows/qwindowskeymapper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins/platforms/windows/qwindowskeymapper.cpp') diff --git a/src/plugins/platforms/windows/qwindowskeymapper.cpp b/src/plugins/platforms/windows/qwindowskeymapper.cpp index 229e485e22..0075578047 100644 --- a/src/plugins/platforms/windows/qwindowskeymapper.cpp +++ b/src/plugins/platforms/windows/qwindowskeymapper.cpp @@ -1376,7 +1376,7 @@ QList QWindowsKeyMapper::possibleKeys(const QKeyEvent *e) const quint32 baseKey = kbItem.qtKey[0]; Qt::KeyboardModifiers keyMods = e->modifiers(); if (baseKey == Qt::Key_Return && (e->nativeModifiers() & ExtendedKey)) { - result << int(Qt::Key_Enter | keyMods); + result << (Qt::Key_Enter | keyMods).toCombined(); return result; } result << int(baseKey) + int(keyMods); // The base key is _always_ valid, of course -- cgit v1.2.3