Merge remote-tracking branch 'origin/12.0'

Change-Id: I22e6a20e5a6fc84f777b6cffbd9fb484c90bc51d
This commit is contained in:
Eike Ziller
2023-11-16 08:44:51 +01:00

View File

@@ -293,7 +293,11 @@ void TerminalWidget::setupActions()
this, this,
&TerminalWidget::moveCursorWordRight); &TerminalWidget::moveCursorWordRight);
unlockGlobalAction(Core::Constants::EXIT); // Ctrl+Q, the default "Quit" shortcut, is a useful key combination in a shell.
// It can be used in combination with Ctrl+S to pause a program, and resume it with Ctrl+Q.
// So we unlock the EXIT command only for macOS where the default is Cmd+Q to quit.
if (HostOsInfo::isMacHost())
unlockGlobalAction(Core::Constants::EXIT);
unlockGlobalAction(Core::Constants::OPTIONS); unlockGlobalAction(Core::Constants::OPTIONS);
unlockGlobalAction("Preferences.Terminal.General"); unlockGlobalAction("Preferences.Terminal.General");
unlockGlobalAction(Core::Constants::FIND_IN_DOCUMENT); unlockGlobalAction(Core::Constants::FIND_IN_DOCUMENT);