whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compiler warnings after QKeyCombination introduction 

Change-Id: If5d7c5e037b99c14c51d83adf8b1e20d6b924bc5
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
bb10
Volker Hilsheimer 2020-09-04 09:50:10 +02:00
parent c549c35408
commit 78695bbf19
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/platforms/cocoa/qcocoamenuitem.mm
View File

@ -353,9 +353,8 @@ NSMenuItem *QCocoaMenuItem::sync()
#ifndef QT_NO_SHORTCUT
if (accel.count() == 1) {
auto shortcut = accel[0];
auto key = Qt::Key(shortcut & ~Qt::KeyboardModifierMask);
auto modifiers = Qt::KeyboardModifiers(shortcut & Qt::KeyboardModifierMask);
auto key = accel[0].key();
auto modifiers = accel[0].keyboardModifiers();
QChar cocoaKey = QCocoaKeyMapper::toCocoaKey(key);
if (cocoaKey.isNull())

16
src/plugins/platforms/cocoa/qcocoatheme.mm
View File

@ -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;