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

VCS: Colorize unmerged files in submit editor

Browse Source 
So far, conflicted files were displayed like added ones.

Now they are marked obvious, as they disable the commit button.

Task-number: QTCREATORBUG-16297
Change-Id: Iedf834408a747c4fe5f2133790c5fb81e7fea265
Reviewed-by: Hugues Delorme <delorme.hugues@fougue.pro>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Andre Hartmann
2016-05-19 19:01:25 +02:00
committed by Orgad Shaneh
parent 67f9a26208
commit 3a78b610d7
8 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/vcsbase/submitfilemodel.h
View File

@@ -75,7 +75,8 @@ public:
FileAdded,
FileModified,
FileDeleted,
FileRenamed
FileRenamed,
FileUnmerged
};
// Function that converts(qualifies) a QString/QVariant pair to FileStatusHint