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

Merge remote-tracking branch 'origin/4.9'

Browse Source 
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/tools/clangpchmanagerbackend/source/taskscheduler.h

Change-Id: I518adaf647df412887c2a372416634359f09ad2a
This commit is contained in:
Eike Ziller
2019-03-05 10:22:45 +01:00
parent 44886ad65a 26f6cbf8b5
commit 0619de8681
60 changed files with 702 additions and 684 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/autotest/testresultmodel.cpp
View File

@@ -121,7 +121,7 @@ void TestResultItem::updateResult(bool &changed, Result::Type addedChildType)
if (!TestResult::isMessageCaseStart(old))
return;
Result::Type newResult = Result::MessageTestCaseSuccess;
Result::Type newResult = old;
switch (addedChildType) {
case Result::Fail:
case Result::MessageFatal: