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

Merge remote-tracking branch 'origin/4.8'

Browse Source 
Conflicts:
	tests/unit/unittest/unittest.pro

Change-Id: I4f0ab05f96ee60900a3a35fad4c7331238367593
This commit is contained in:
Eike Ziller
2018-11-09 13:30:40 +01:00
parent 951eb885af dc82e49b62
commit 3666e3aaeb
153 changed files with 3881 additions and 2057 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/branchmodel.cpp
View File

@@ -318,7 +318,7 @@ Qt::ItemFlags BranchModel::flags(const QModelIndex &index) const
if (!node)
return Qt::NoItemFlags;
Qt::ItemFlags res = Qt::ItemIsSelectable | Qt::ItemIsEnabled;
if (node->isLeaf() && node->isLocal())
if (node->isLeaf() && node->isLocal() && index.column() == 0)
res |= Qt::ItemIsEditable;
return res;
}