Merge remote-tracking branch 'origin/5.0'

 Conflicts:
	src/libs/utils/qtcprocess.cpp

Change-Id: I1f7419d927e8534dfdcd10db998f97a6efd4d3e4

2 files changed, 2 insertions, 2 deletions

diff --git a/src/plugins/autotest/qtest/qttesttreeitem.cpp b/src/plugins/autotest/qtest/qttesttreeitem.cpp
index 6655bec509..d9a7baaf5f 100644
--- a/src/plugins/autotest/qtest/qttesttreeitem.cpp
+++ b/src/plugins/autotest/qtest/qttesttreeitem.cpp
@@ -226,7 +226,7 @@ static void collectFailedTestInfo(TestTreeItem *item, QList<ITestConfiguration *
     QTC_ASSERT(item->type() == TestTreeItem::TestCase, return);
     QStringList testCases;
     item->forFirstLevelChildren([&testCases](ITestTreeItem *func) {
-        if (func->data(0, FailedRole).toBool()) {
+        if (func->type() == TestTreeItem::TestFunction && func->data(0, FailedRole).toBool()) {
             testCases << func->name();
         } else {
             func->forFirstLevelChildren([&testCases, func](ITestTreeItem *dataTag) {
diff --git a/src/plugins/autotest/quick/quicktesttreeitem.cpp b/src/plugins/autotest/quick/quicktesttreeitem.cpp
index e80432674f..d47cac6c8e 100644
--- a/src/plugins/autotest/quick/quicktesttreeitem.cpp
+++ b/src/plugins/autotest/quick/quicktesttreeitem.cpp
@@ -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;
     });
 }