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

Merge remote-tracking branch 'origin/12.0'

Browse Source 
Conflicts:
	src/plugins/cppeditor/cppfilesettingspage.cpp
	src/plugins/haskell/haskellplugin.h

Change-Id: I880693c2e4986853b7aa600a5b7d6c09ad14634e
This commit is contained in:
Eike Ziller
2024-01-30 09:00:47 +01:00
parent 7e8aac5f3c 79e323afbf
commit 30d048a256
14 changed files with 68 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/fakevim/fakevimplugin.cpp
View File

@@ -1092,7 +1092,7 @@ void FakeVimPlugin::initialize()
INSTALL_HANDLER, Context(Core::Constants::C_GLOBAL), true);
cmd->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+Shift+Y,Meta+Shift+Y")
: Tr::tr("Alt+Y,Alt+Y")));
connect(cmd->action(), &QAction::triggered, [this] { settings().writeSettings(); });
connect(cmd->action(), &QAction::triggered, [] { settings().writeSettings(); });
ActionContainer *advancedMenu =
ActionManager::actionContainer(Core::Constants::M_EDIT_ADVANCED);