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

Git: Avoid QProcess::waitForReadyRead in MergeTool

Browse Source 
It's unreliable on Windows with Qt 5.7.

Change-Id: I0703ae825e9db80ac8063d9f6962863a68591ed6
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2016-09-20 11:14:00 +03:00
committed by Orgad Shaneh
parent c64b3f9882
commit ff963bc184
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/mergetool.h
View File

@@ -69,7 +69,7 @@ private:
void done();
void write(const QByteArray &bytes);
FileState waitAndReadStatus(QString &extraInfo);
FileState parseStatus(const QByteArray &line, QString &extraInfo);
QString mergeTypeName();
QString stateName(FileState state, const QString &extraInfo);
void chooseAction();