diff options
| author | Knud Dollereder <knud.dollereder@qt.io> | 2021-06-04 13:50:31 +0200 |
|---|---|---|
| committer | Knud Dollereder <knud.dollereder@qt.io> | 2021-06-04 13:30:20 +0000 |
| commit | 2fa63a2801f4dc9a56daf29e41954b8cdc214afb (patch) | |
| tree | 05abba98b5037d7773b2962bf8097075e50a2a74 /src/plugins/texteditor/texteditoractionhandler.cpp | |
| parent | 637837edf1b93654e15b74521327f6b1d507f940 (diff) | |
Fix QKeySequence construction on macOS
Constructing a QKeySequence with the string "Cmd+Opt+Shift+V" leads
to an invalid, non-empty QKeySequence when compiling Design Studio
on macOS. This triggers an assertion later in the code path.
Using “Ctrl+Alt+Shift+V” instead works as expected.
Change-Id: I7cb185d18f9ffbb7454c61f28a93cdd307121882
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/texteditor/texteditoractionhandler.cpp')
| -rw-r--r-- | src/plugins/texteditor/texteditoractionhandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp index ee965e8e9c..98b66f1000 100644 --- a/src/plugins/texteditor/texteditoractionhandler.cpp +++ b/src/plugins/texteditor/texteditoractionhandler.cpp @@ -273,7 +273,7 @@ void TextEditorActionHandlerPrivate::createActions() QKeySequence(tr("Ctrl+Shift+V")), G_EDIT_COPYPASTE, editMenu); m_modifyingActions << registerAction(NO_FORMAT_PASTE, [] (TextEditorWidget *w) { w->pasteWithoutFormat(); }, false, tr("Paste Without Formatting"), - QKeySequence(Core::useMacShortcuts ? tr("Cmd+Opt+Shift+V") : QString()), G_EDIT_COPYPASTE, editMenu); + QKeySequence(Core::useMacShortcuts ? tr("Ctrl+Alt+Shift+V") : QString()), G_EDIT_COPYPASTE, editMenu); // register "Edit -> Advanced" Menu Actions Core::ActionContainer *advancedEditMenu = Core::ActionManager::actionContainer(M_EDIT_ADVANCED); |