diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-11-09 13:30:40 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-11-09 13:30:40 +0100 |
| commit | 3666e3aaeb26f91097a473491ea4cf58219029ca (patch) | |
| tree | 2d1387557e243eacfe78698371c7726aa9a19350 /src/plugins/git | |
| parent | 951eb885af8692c2c4aac67d18e3cbf033b7e912 (diff) | |
| parent | dc82e49b62d6b851900689321828aee95f8eab54 (diff) | |
Merge remote-tracking branch 'origin/4.8'
Conflicts:
tests/unit/unittest/unittest.pro
Change-Id: I4f0ab05f96ee60900a3a35fad4c7331238367593
Diffstat (limited to 'src/plugins/git')
| -rw-r--r-- | src/plugins/git/branchmodel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/git/branchmodel.cpp b/src/plugins/git/branchmodel.cpp index 8c9db00828..b045953e18 100644 --- a/src/plugins/git/branchmodel.cpp +++ b/src/plugins/git/branchmodel.cpp @@ -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; } |