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

Merge remote-tracking branch 'origin/4.5'

Browse Source 
Change-Id: Iceaa4ca40b5318744bde8a76c6d3ccca08df71bb
This commit is contained in:
Eike Ziller
2017-10-25 16:07:21 +02:00
parent 81f5c1c8ec dd60923713
commit 7f626b1182
108 changed files with 964 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/coreplugin/dialogs/externaltoolconfig.cpp
View File

@@ -184,7 +184,7 @@ QModelIndex ExternalToolModel::index(int row, int column, const QModelIndex &par
if (row < items.count())
return createIndex(row, 0, items.at(row));
}
} else if (column == 0 && row < m_tools.keys().count()) {
} else if (column == 0 && row < m_tools.size()) {
return createIndex(row, 0);
}
return QModelIndex();
@@ -208,7 +208,7 @@ QModelIndex ExternalToolModel::parent(const QModelIndex &child) const
int ExternalToolModel::rowCount(const QModelIndex &parent) const
{
if (!parent.isValid())
return m_tools.keys().count();
return m_tools.size();
if (toolForIndex(parent))
return 0;
bool found;