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

Merge remote-tracking branch 'origin/4.15'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp

Change-Id: I403b236c40d73a61ae22304e289e9d4374366395
This commit is contained in:
Eike Ziller
2021-04-06 15:17:40 +02:00
parent 1c50f441a2 a8d9fb0e6e
commit c0cfafdd3d
221 changed files with 4167 additions and 3192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/autotest/boost/boosttestoutputreader.cpp
View File

@@ -421,17 +421,17 @@ void BoostTestOutputReader::onFinished(int exitCode, QProcess::ExitStatus /*exit
if (m_logLevel == LogLevel::Nothing && m_reportLevel == ReportLevel::No) {
switch (exitCode) {
case 0:
reportNoOutputFinish(tr("Running tests exited with ") + "boost::exit_success.",
reportNoOutputFinish(tr("Running tests exited with %1").arg("boost::exit_success."),
ResultType::Pass);
break;
case 200:
reportNoOutputFinish(
tr("Running tests exited with ") + "boost::exit_test_exception.",
tr("Running tests exited with %1").arg("boost::exit_test_exception."),
ResultType::MessageFatal);
break;
case 201:
reportNoOutputFinish(tr("Running tests exited with ")
+ "boost::exit_test_failure.", ResultType::Fail);
reportNoOutputFinish(tr("Running tests exited with %1")
.arg("boost::exit_test_failure."), ResultType::Fail);
break;
}
} else if (exitCode != 0 && exitCode != 201 && !m_description.isEmpty()) {