diff options
author | Eike Ziller <eike.ziller@qt.io> | 2024-01-30 09:00:47 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2024-01-30 09:19:06 +0100 |
commit | 30d048a256282c50e081d27dec25f37c5a5dfcd6 (patch) | |
tree | 31b6d6d1a977cad30021c91111e3ef0381f6b9d6 /src/plugins/fakevim | |
parent | 7e8aac5f3c332bc1bc3e947dedad3157cdc43fcd (diff) | |
parent | 79e323afbfc8c4a43580a993fb668215387c9564 (diff) |
Merge remote-tracking branch 'origin/12.0'
Conflicts:
src/plugins/cppeditor/cppfilesettingspage.cpp
src/plugins/haskell/haskellplugin.h
Change-Id: I880693c2e4986853b7aa600a5b7d6c09ad14634e
Diffstat (limited to 'src/plugins/fakevim')
-rw-r--r-- | src/plugins/fakevim/fakevimplugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp index 41d8768697..07b5ec3b74 100644 --- a/src/plugins/fakevim/fakevimplugin.cpp +++ b/src/plugins/fakevim/fakevimplugin.cpp @@ -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); |