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

Merge remote-tracking branch 'origin/3.6'

Browse Source 
Change-Id: Iedfd7373f3e4cf60d101aace1b0b25d41f11cda1
This commit is contained in:
Eike Ziller
2015-12-15 11:50:24 +01:00
parent fb7ceae64b 1a8f37db0e
commit e72cfeefba
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/autotest/testresultmodel.cpp
View File

@@ -137,7 +137,6 @@ void TestResultModel::addTestResult(TestResult *testResult, bool autoExpand)
QVector<Utils::TreeItem *> topLevelItems = rootItem()->children(); QVector<Utils::TreeItem *> topLevelItems = rootItem()->children();
int lastRow = topLevelItems.size() - 1; int lastRow = topLevelItems.size() - 1;
TestResultItem *newItem = new TestResultItem(testResult);
// we'll add the new item, so raising it's counter // we'll add the new item, so raising it's counter
if (!isCurrentTestMssg) { if (!isCurrentTestMssg) {
int count = m_testResultCount.value(testResult->result(), 0); int count = m_testResultCount.value(testResult->result(), 0);
@@ -150,14 +149,16 @@ void TestResultModel::addTestResult(TestResult *testResult, bool autoExpand)
if (result && result->result() == Result::MessageCurrentTest) { if (result && result->result() == Result::MessageCurrentTest) {
current->updateDescription(testResult->description()); current->updateDescription(testResult->description());
emit dataChanged(current->index(), current->index()); emit dataChanged(current->index(), current->index());
delete testResult;
return; return;
} }
} }
rootItem()->appendChild(newItem); rootItem()->appendChild(new TestResultItem(testResult));
return; return;
} }
TestResultItem *newItem = new TestResultItem(testResult);
// FIXME this might be totally wrong... we need some more unique information! // FIXME this might be totally wrong... we need some more unique information!
for (int row = lastRow; row >= 0; --row) { for (int row = lastRow; row >= 0; --row) {
TestResultItem *current = static_cast<TestResultItem *>(topLevelItems.at(row)); TestResultItem *current = static_cast<TestResultItem *>(topLevelItems.at(row));