From 7819fc5dfbf18025112bab0c9a7ea3acaae418ec Mon Sep 17 00:00:00 2001 From: Marcus Tillmanns Date: Wed, 15 Nov 2023 14:53:48 +0100 Subject: [PATCH] Terminal: Only unlock exit on macOS Fixes: QTCREATORBUG-29902 Change-Id: Ifbb1f12c874f2f68483a34ac6e117214211e5be4 Reviewed-by: Eike Ziller --- src/plugins/terminal/terminalwidget.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/plugins/terminal/terminalwidget.cpp b/src/plugins/terminal/terminalwidget.cpp index 584a15a90cd..57fdea52a6d 100644 --- a/src/plugins/terminal/terminalwidget.cpp +++ b/src/plugins/terminal/terminalwidget.cpp @@ -293,7 +293,11 @@ void TerminalWidget::setupActions() this, &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("Preferences.Terminal.General"); unlockGlobalAction(Core::Constants::FIND_IN_DOCUMENT);