From 2fa63a2801f4dc9a56daf29e41954b8cdc214afb Mon Sep 17 00:00:00 2001 From: Knud Dollereder Date: Fri, 4 Jun 2021 13:50:31 +0200 Subject: [PATCH] Fix QKeySequence construction on macOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/plugins/texteditor/texteditoractionhandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp index ee965e8e9cd..98b66f10008 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);