diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-11-11 07:03:38 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-11-12 09:44:32 +0100 |
| commit | 0c1341ed5ac478cdb5bfb8373bc71a5a292bbec6 (patch) | |
| tree | e147518cc6c9a8dc03041d86450ecb5901c43f51 /src/plugins/platforms/windows/qwindowskeymapper.cpp | |
| parent | 190b77463d40db0278919992912d48d1e96e4796 (diff) | |
Windows QPA: Fix a warning about deprecated conversion of keys
Use QKeyCombinaton::toCombined().
Change-Id: I829f4e88ad316a6f4f5165c1d929f2dcc83f83de
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowskeymapper.cpp')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowskeymapper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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<int> 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 |