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

QmlDesigner: initialize actions only at show

Browse Source 
Change-Id: Iff6438daf70840116f02fcc439a6327c9401c32c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Tim Jenssen
2017-07-26 17:17:45 +02:00
parent 9fde45fb52
commit a5625f2f9d
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qmldesigner/components/componentcore/designeractionmanagerview.cpp
View File

@@ -37,7 +37,6 @@ DesignerActionManagerView::DesignerActionManagerView()
m_isInRewriterTransaction(false), m_isInRewriterTransaction(false),
m_setupContextDirty(false) m_setupContextDirty(false)
{ {
m_designerActionManager.createDefaultDesignerActions();
} }
void DesignerActionManagerView::modelAttached(Model *model) void DesignerActionManagerView::modelAttached(Model *model)

3
src/plugins/qmldesigner/designmodewidget.cpp
View File

@@ -229,6 +229,9 @@ static void hideToolButtons(QList<QToolButton*> &buttons)
void DesignModeWidget::setup() void DesignModeWidget::setup()
{ {
viewManager().designerActionManager().createDefaultDesignerActions();
viewManager().designerActionManager().polishActions();
QList<Core::INavigationWidgetFactory *> factories = QList<Core::INavigationWidgetFactory *> factories =
ExtensionSystem::PluginManager::getObjects<Core::INavigationWidgetFactory>(); ExtensionSystem::PluginManager::getObjects<Core::INavigationWidgetFactory>();

2
src/plugins/qmldesigner/qmldesignerplugin.cpp
View File

@@ -286,8 +286,6 @@ void QmlDesignerPlugin::integrateIntoQtCreator(QWidget *modeWidget)
} }
} }
}); });
d->viewManager.designerActionManager().polishActions();
} }
void QmlDesignerPlugin::showDesigner() void QmlDesignerPlugin::showDesigner()