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

Merge remote-tracking branch 'origin/4.12'

Browse Source 
Conflicts:
	src/tools/qml2puppet/CMakeLists.txt

Change-Id: Id6243b0f725a68075d789bf35e771113b742645b
This commit is contained in:
Eike Ziller
2020-03-30 17:27:55 +02:00
parent 4e199eed8d 41099a5eed
commit 9a149e295b
89 changed files with 1643 additions and 790 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/autotest/testtreemodel.cpp
View File

@@ -611,13 +611,13 @@ int TestTreeModel::boostTestNamesCount() const
return rootNode ? rootNode->childCount() : 0;
}
QMultiMap<QString, int> TestTreeModel::boostTestSuitesAndTests() const
QMap<QString, int> TestTreeModel::boostTestSuitesAndTests() const
{
QMultiMap<QString, int> result;
QMap<QString, int> result;
if (TestTreeItem *rootNode = boostTestRootNode()) {
rootNode->forFirstLevelChildren([&result](TestTreeItem *child) {
result.insert(child->name(), child->childCount());
result.insert(child->name() + '|' + child->proFile(), child->childCount());
});
}
return result;