diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-09-04 09:50:10 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-09-05 02:03:40 +0200 |
commit | 78695bbf190bd93915d44386a7b96866dbbd29b5 (patch) | |
tree | f3e983dca276fa16c177f8575696dcca4f32452b /src/plugins/platforms/cocoa/qcocoatheme.mm | |
parent | c549c3540851b4551ae520fa6cda88a806dce6ec (diff) |
Fix compiler warnings after QKeyCombination introduction
Change-Id: If5d7c5e037b99c14c51d83adf8b1e20d6b924bc5
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoatheme.mm')
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoatheme.mm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoatheme.mm b/src/plugins/platforms/cocoa/qcocoatheme.mm index 2e305ffb3d..af4c1550e7 100644 --- a/src/plugins/platforms/cocoa/qcocoatheme.mm +++ b/src/plugins/platforms/cocoa/qcocoatheme.mm @@ -575,14 +575,14 @@ QList<QKeySequence> QCocoaTheme::keyBindings(QKeySequence::StandardKey key) cons auto bindings = QPlatformTheme::keyBindings(key); if (qApp->testAttribute(Qt::AA_MacDontSwapCtrlAndMeta)) { - static auto swapCtrlMeta = [](int keySequence) { - auto originalKeySequence = keySequence; - keySequence &= ~(Qt::ControlModifier | Qt::MetaModifier); - if (originalKeySequence & Qt::ControlModifier) - keySequence |= Qt::MetaModifier; - if (originalKeySequence & Qt::MetaModifier) - keySequence |= Qt::ControlModifier; - return keySequence; + static auto swapCtrlMeta = [](QKeyCombination keyCombination) { + const auto originalKeyModifiers = keyCombination.keyboardModifiers(); + auto newKeyboardModifiers = originalKeyModifiers & ~(Qt::ControlModifier | Qt::MetaModifier); + if (originalKeyModifiers & Qt::ControlModifier) + newKeyboardModifiers |= Qt::MetaModifier; + if (originalKeyModifiers & Qt::MetaModifier) + newKeyboardModifiers |= Qt::ControlModifier; + return QKeyCombination(newKeyboardModifiers, keyCombination.key()); }; QList<QKeySequence> swappedBindings; |