Merge remote-tracking branch 'origin/11.0'

Conflicts:
	src/plugins/debugger/debuggeritemmanager.cpp

Change-Id: I9d99d13feff9315f52eacbd84857c63cb69bf804
This commit is contained in:
Eike Ziller
2023-07-03 10:24:09 +02:00
77 changed files with 4785 additions and 1883 deletions

View File

@@ -4,6 +4,7 @@
#include "testresultmodel.h"
#include "autotesticons.h"
#include "testresultspane.h"
#include "testrunner.h"
#include "testsettings.h"
#include "testtreeitem.h"
@@ -15,6 +16,7 @@
#include <QFontMetrics>
#include <QIcon>
#include <QToolButton>
using namespace Utils;
@@ -185,6 +187,17 @@ TestResultItem *TestResultItem::createAndAddIntermediateFor(const TestResultItem
result.setResult(ResultType::TestStart);
TestResultItem *intermediate = new TestResultItem(result);
appendChild(intermediate);
// FIXME: make the expand button's state easier accessible
auto widgets = TestResultsPane::instance()->toolBarWidgets();
if (!widgets.empty()) {
if (QToolButton *expand = qobject_cast<QToolButton *>(widgets.at(0))) {
if (expand->isChecked()) {
QMetaObject::invokeMethod(TestResultsPane::instance(),
[intermediate] { intermediate->expand(); },
Qt::QueuedConnection);
}
}
}
return intermediate;
}