diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-11-12 13:39:20 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-11-12 13:39:26 +0100 |
| commit | dffd49ef0743660e40cf36865c06c07718c7102a (patch) | |
| tree | 98abf32fbee816c41eaef50527979f1b989ccaa1 | |
| parent | b00698e26cbe3d404dd25f9776efb2ca02be4a1f (diff) | |
| parent | fa9912f3ad774bf71230ce9239b1e548c572c61a (diff) | |
Merge remote-tracking branch 'origin/3.6'
Change-Id: I8e1d8505ae84773e58287dbc13a36d83835cb658
| -rw-r--r-- | plugins/autotest/testtreeitem.cpp | 1 | ||||
| -rw-r--r-- | plugins/autotest/testtreemodel.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/plugins/autotest/testtreeitem.cpp b/plugins/autotest/testtreeitem.cpp index 6c29f886e8..d25964cfb5 100644 --- a/plugins/autotest/testtreeitem.cpp +++ b/plugins/autotest/testtreeitem.cpp @@ -101,6 +101,7 @@ QVariant TestTreeItem::data(int /*column*/, int role) const case ROOT: case TEST_DATAFUNCTION: case TEST_SPECIALFUNCTION: + case TEST_DATATAG: return QVariant(); case TEST_CLASS: return m_name.isEmpty() ? QVariant() : checked(); diff --git a/plugins/autotest/testtreemodel.cpp b/plugins/autotest/testtreemodel.cpp index 49e28c3ba3..c59d69a745 100644 --- a/plugins/autotest/testtreemodel.cpp +++ b/plugins/autotest/testtreemodel.cpp @@ -169,6 +169,7 @@ Qt::ItemFlags TestTreeModel::flags(const QModelIndex &index) const return Qt::ItemIsEnabled; case TestTreeItem::TEST_DATAFUNCTION: case TestTreeItem::TEST_SPECIALFUNCTION: + case TestTreeItem::TEST_DATATAG: default: return Qt::ItemIsEnabled | Qt::ItemIsSelectable; } |