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

Merge remote-tracking branch 'origin/4.7'

Browse Source 
Conflicts:
	src/plugins/clangtools/clangtoolruncontrol.cpp
	src/plugins/cpptools/compileroptionsbuilder.cpp

Change-Id: Ib1e8abf066898b50c90fc1ccba4697fe983e8a8f
This commit is contained in:
Eike Ziller
2018-08-15 13:53:28 +02:00
parent 7bc14bf349 58747b2de1
commit db9837fa6c
542 changed files with 83219 additions and 67095 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/autotest/testtreemodel.cpp
View File

@@ -346,13 +346,13 @@ static void applyParentCheckState(TestTreeItem *parent, TestTreeItem *newItem)
void TestTreeModel::insertItemInParent(TestTreeItem *item, TestTreeItem *root, bool groupingEnabled)
{
TestTreeItem *parentNode = root;
if (groupingEnabled) {
if (groupingEnabled && item->isGroupable()) {
parentNode = root->findFirstLevelChild([item] (const TestTreeItem *it) {
return it->isGroupNodeFor(item);
});
if (!parentNode) {
parentNode = item->createParentGroupNode();
if (!parentNode) // we might not get a group node at all
if (!QTC_GUARD(parentNode)) // we might not get a group node at all
parentNode = root;
else
root->appendChild(parentNode);