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: I8e1d8505ae84773e58287dbc13a36d83835cb658
This commit is contained in:
Eike Ziller
2015-11-12 13:39:20 +01:00
parent b00698e26c fa9912f3ad
commit dffd49ef07
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/autotest/testtreeitem.cpp
View File

@@ -101,6 +101,7 @@ QVariant TestTreeItem::data(int /*column*/, int role) const
case ROOT: case ROOT:
case TEST_DATAFUNCTION: case TEST_DATAFUNCTION:
case TEST_SPECIALFUNCTION: case TEST_SPECIALFUNCTION:
case TEST_DATATAG:
return QVariant(); return QVariant();
case TEST_CLASS: case TEST_CLASS:
return m_name.isEmpty() ? QVariant() : checked(); return m_name.isEmpty() ? QVariant() : checked();

1
plugins/autotest/testtreemodel.cpp
View File

@@ -169,6 +169,7 @@ Qt::ItemFlags TestTreeModel::flags(const QModelIndex &index) const
return Qt::ItemIsEnabled; return Qt::ItemIsEnabled;
case TestTreeItem::TEST_DATAFUNCTION: case TestTreeItem::TEST_DATAFUNCTION:
case TestTreeItem::TEST_SPECIALFUNCTION: case TestTreeItem::TEST_SPECIALFUNCTION:
case TestTreeItem::TEST_DATATAG:
default: default:
return Qt::ItemIsEnabled | Qt::ItemIsSelectable; return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
} }