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

Beautifier: Fix freeze in extensionsInitialized

Browse Source 
Amends c9a7a3a2d3.

Change-Id: Id14412a584c20e3e14b5c377857af43622ccf65d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2020-06-22 11:19:01 +02:00
committed by Eike Ziller
parent 8836cdb75a
commit dd9656cf84
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/beautifier/clangformat/clangformat.cpp
View File

@@ -54,11 +54,9 @@ using namespace TextEditor;
namespace Beautifier { namespace Beautifier {
namespace Internal { namespace Internal {
const char MENU_ID[] = "ClangFormat.Menu";
ClangFormat::ClangFormat() ClangFormat::ClangFormat()
{ {
Core::ActionContainer *menu = Core::ActionManager::createMenu(MENU_ID); Core::ActionContainer *menu = Core::ActionManager::createMenu("ClangFormat.Menu");
menu->menu()->setTitle(tr("&ClangFormat")); menu->menu()->setTitle(tr("&ClangFormat"));
m_formatFile = new QAction(BeautifierPlugin::msgFormatCurrentFile(), this); m_formatFile = new QAction(BeautifierPlugin::msgFormatCurrentFile(), this);
@@ -80,7 +78,7 @@ ClangFormat::ClangFormat()
connect(m_disableFormattingSelectedText, &QAction::triggered, connect(m_disableFormattingSelectedText, &QAction::triggered,
this, &ClangFormat::disableFormattingSelectedText); this, &ClangFormat::disableFormattingSelectedText);
Core::ActionManager::actionContainer(MENU_ID)->addMenu(menu); Core::ActionManager::actionContainer(Constants::MENU_ID)->addMenu(menu);
connect(&m_settings, &ClangFormatSettings::supportedMimeTypesChanged, connect(&m_settings, &ClangFormatSettings::supportedMimeTypesChanged,
[this] { updateActions(Core::EditorManager::currentEditor()); }); [this] { updateActions(Core::EditorManager::currentEditor()); });