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

Merge remote-tracking branch 'origin/4.6'

Browse Source 
Conflicts:
	share/qtcreator/qml-type-descriptions/qmlproject.qmltypes
	src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp

Change-Id: I35fb652f29a98a798be7c8b4b4c2e581eb175fb6
This commit is contained in:
Eike Ziller
2018-02-01 09:58:36 +01:00
parent 6b29198874 97631cfdb8
commit ecb9fae785
138 changed files with 1554 additions and 781 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -229,8 +229,10 @@ static void hideToolButtons(QList<QToolButton*> &buttons)
void DesignModeWidget::setup()
{
viewManager().designerActionManager().createDefaultDesignerActions();
viewManager().designerActionManager().polishActions();
auto &actionManager = viewManager().designerActionManager();
actionManager.createDefaultDesignerActions();
actionManager.createDefaultAddResourceHandler();
actionManager.polishActions();
QList<Core::INavigationWidgetFactory *> factories =
Core::INavigationWidgetFactory::allNavigationFactories();