forked from qt-creator/qt-creator
Merge remote-tracking branch 'origin/7.0'
Conflicts: src/libs/utils/qtcprocess.cpp src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp Change-Id: Id0c31719e46d1c44770ea89663eee321a0517ff4
This commit is contained in:
@@ -234,11 +234,6 @@ void ItemLibraryModel::showAllHiddenCategories()
|
||||
void ItemLibraryModel::setFlowMode(bool b)
|
||||
{
|
||||
m_flowMode = b;
|
||||
bool changed = false;
|
||||
if (updateVisibility(&changed); changed) {
|
||||
beginResetModel();
|
||||
endResetModel();
|
||||
}
|
||||
}
|
||||
|
||||
ItemLibraryModel::ItemLibraryModel(QObject *parent)
|
||||
|
||||
Reference in New Issue
Block a user