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

Merge remote-tracking branch 'origin/4.1' into 4.2

Browse Source 
Change-Id: Ibe4cd5522e1d87d56d2aae7a429282b41bf18647
This commit is contained in:
Eike Ziller
2016-10-12 16:02:23 +02:00
parent a77c5836e9 169723dd87
commit 5b47c653c1
10 changed files with 2741 additions and 1608 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/autotest/quick/quicktesttreeitem.cpp
View File

@@ -237,7 +237,7 @@ QList<TestConfiguration *> QuickTestTreeItem::getSelectedTestConfigurations() co
int grandChildCount = child->childCount();
for (int grandChildRow = 0; grandChildRow < grandChildCount; ++grandChildRow) {
const TestTreeItem *grandChild = child->childItem(grandChildRow);
if (grandChild->type() != TestFunctionOrSet)
if (grandChild->checked() != Qt::Checked || grandChild->type() != TestFunctionOrSet)
continue;
testFunctions << child->name() + "::" + grandChild->name();
}