diff options
| author | Eike Ziller <[email protected]> | 2023-11-15 10:32:59 +0100 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2023-11-15 10:32:59 +0100 |
| commit | 056168beca8d2fbca8e13eefe1037fb2f66c0c0a (patch) | |
| tree | d73271b007d69cd4f4b00295cbf3b98cd95609fe /src/plugins/terminal/terminalwidget.cpp | |
| parent | 0269626a17baa00e7fd949ab8ca697ea47029175 (diff) | |
| parent | 90e6fb54b6606bfa61d1679002887b4cb757fe37 (diff) | |
Merge remote-tracking branch 'gerrit/12.0'
Conflicts:
src/plugins/texteditor/texteditor.cpp
Change-Id: I76620975760a8f9e64f6d381c948d457e949a87c
Diffstat (limited to 'src/plugins/terminal/terminalwidget.cpp')
| -rw-r--r-- | src/plugins/terminal/terminalwidget.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/terminal/terminalwidget.cpp b/src/plugins/terminal/terminalwidget.cpp index b2584e1b059..179e729721b 100644 --- a/src/plugins/terminal/terminalwidget.cpp +++ b/src/plugins/terminal/terminalwidget.cpp @@ -571,6 +571,12 @@ bool TerminalWidget::event(QEvent *event) return true; } + if (settings().lockKeyboard() + && QKeySequence(keyEvent->keyCombination()) + == ActionManager::command(Constants::TOGGLE_KEYBOARD_LOCK)->keySequence()) { + return false; + } + if (settings().lockKeyboard()) { event->accept(); return true; |