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

Merge remote-tracking branch 'origin/5.0'

Browse Source 
Conflicts:
	src/libs/utils/qtcprocess.cpp

Change-Id: I1f7419d927e8534dfdcd10db998f97a6efd4d3e4
This commit is contained in:
Eike Ziller
2021-08-18 09:48:39 +02:00
parent 20a4afaaa4 773d0fdcc5
commit 6d44c28f0a
41 changed files with 322 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/autotest/qtest/qttesttreeitem.cpp
View File

@@ -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) {

2
src/plugins/autotest/quick/quicktesttreeitem.cpp
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;
});
}