feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/13.0'

Browse Source 
Conflicts:
	src/plugins/cmakeprojectmanager/cmaketool.cpp
	src/plugins/python/pythonutils.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: Ia3e35c763ff9475d17ad922718b54152209893b8
This commit is contained in:
Eike Ziller
2024-03-14 11:35:07 +01:00
parent 685f452d91 11752615c5
commit c19f97bd23
97 changed files with 699 additions and 671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/terminal/terminalwidget.cpp
View File

@@ -280,9 +280,10 @@ void TerminalWidget::setupActions()
pasteAction.addOnTriggered(this, &TerminalWidget::pasteFromClipboard);
m_paste = make_registered(pasteAction);
ActionBuilder closeAction(this, Core::Constants::CLOSE);
closeAction.setContext(m_context);
closeAction.addOnTriggered(this, &TerminalWidget::closeTerminal);
ActionBuilder(this, Core::Constants::CLOSE)
.setContext(m_context)
.addOnTriggered(this, &TerminalWidget::closeTerminal)
.setText(Tr::tr("Close Terminal"));
// We do not register the close action, as we want it to be blocked if the keyboard is locked.
ActionBuilder clearTerminalAction(this, Constants::CLEAR_TERMINAL);
@@ -689,9 +690,6 @@ void TerminalWidget::initActions(QObject *parent)
moveCursorWordRightAction.setText(Tr::tr("Move Cursor Word Right"));
moveCursorWordRightAction.setContext(context);
moveCursorWordRightAction.setDefaultKeySequence({QKeySequence("Alt+Right")});
ActionBuilder closeAction(parent, Core::Constants::CLOSE);
closeAction.setText(Tr::tr("Close Terminal"));
}
void TerminalWidget::unlockGlobalAction(const Utils::Id &commandId)