Merge remote-tracking branch 'origin/5.0'

Conflicts:
	src/libs/utils/qtcprocess.cpp

Change-Id: I1f7419d927e8534dfdcd10db998f97a6efd4d3e4
This commit is contained in:
Eike Ziller
2021-08-18 09:48:39 +02:00
41 changed files with 322 additions and 129 deletions

View File

@@ -271,7 +271,7 @@ QList<ITestConfiguration *> QuickTestTreeItem::getSelectedTestConfigurations() c
QList<ITestConfiguration *> QuickTestTreeItem::getFailedTestConfigurations() const
{
return testConfigurationsFor(this, [](TestTreeItem *it) {
return it->data(0, FailedRole).toBool();
return it->data(0, FailedRole).toBool() && it->type() == TestTreeItem::TestFunction;
});
}