[4.4.4] MacOSShortcutsInstanceModel: Normalise shortcuts spelling in mapping #25273
Conversation
| QString keyStr = keyCodeToString(keyboard, keyNativeCode); | ||
| QString modifStr = keyModifiersToString(keyNativeModifiers); |
There was a problem hiding this comment.
Do we need these changes? Could you please explain?
There was a problem hiding this comment.
We need to return QKeySequence from this method to be able to get consistent modifier order. It seems to make no sense to convert from Qt modifiers to native modifiers and then from native modifiers back to Qt string notation, and then from Qt string notation to QKeySequence. Instead, we can go directly from Qt modifiers to QKeySequence.
There was a problem hiding this comment.
we need to think about how risky this is for the patch
There was a problem hiding this comment.
Owing to the capricious nature of shortcuts, I suspect this warrants more extensive testing than we currently have time for in 4.4.3. Let's target this for 4.5.
|
Tested #24497 on Mac13.6 - FIXED |
cbjeukendrup
force-pushed
the
port/4.4.3/normalise_shortcut_spelling_in_mapping
branch
from
c38f57f
to
834d407
Compare
cbjeukendrup
changed the title
|
@cbjeukendrup please change the merge branch to 4.4.4 |
|
@cbjeukendrup The builds are still 4.4.3. Can you rebase it on 4.4.4 please? (I'll check it briefly before merge) |
cbjeukendrup
force-pushed
the
port/4.4.3/normalise_shortcut_spelling_in_mapping
branch
from
834d407
to
ebb9d29
Compare
|
It shouldn't matter much (only the commit that changed the version number was not yet present on this branch) but I've rebased anyway for now. |
Resolves: #24497
Resolves: #25314
Resolves: #25321
Resolves: #25373 (according to #25373 (comment))
Ports: #25489
It seems that the problem was that both Ctrl+Meta+E and Meta+Ctrl+E got in the list, which confuses QML, which considers them ambiguous.