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

Merge remote-tracking branch 'origin/4.13' into 4.14

Browse Source 
Change-Id: Ia20a937786be651a5fe9daefb856f7779905ef68
This commit is contained in:
Eike Ziller
2020-10-08 09:46:09 +02:00
parent 3f085cd765 bfc04ed53d
commit 5ab8cc61fc
18 changed files with 128 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/autotest/testresultmodel.cpp
View File

@@ -395,7 +395,7 @@ int TestResultModel::resultTypeCount(ResultType type) const
{
int result = 0;
for (const auto &id : m_reportedSummary.keys()) {
for (const auto &id : m_testResultCount.keys()) {
// if we got a result count from the framework prefer that over our counted results
int reported = m_reportedSummary[id].value(type);
result += reported != 0 ? reported : m_testResultCount.value(id).value(type);