aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/terminal
diff options
context:
space:
mode:
authorMarcus Tillmanns <marcus.tillmanns@qt.io>2023-11-15 14:53:48 +0100
committerMarcus Tillmanns <marcus.tillmanns@qt.io>2023-11-15 14:13:48 +0000
commit7819fc5dfbf18025112bab0c9a7ea3acaae418ec (patch)
tree17cd063da01767d2df2162b4d6cc516cb8d69ccf /src/plugins/terminal
parent90e6fb54b6606bfa61d1679002887b4cb757fe37 (diff)
Terminal: Only unlock exit on macOS
Fixes: QTCREATORBUG-29902 Change-Id: Ifbb1f12c874f2f68483a34ac6e117214211e5be4 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/terminal')
-rw-r--r--src/plugins/terminal/terminalwidget.cpp6
1 files changed, 5 insertions, 1 deletions
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);