From c64b3f98827905b215a9ff95e4fa750596414db7 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Tue, 20 Sep 2016 11:05:03 +0300
Subject: Git: Do not rely on QProcess::readData/writeData in MergeTool

readData always returns 0 in Qt 5.7 (unless the process is not
running)...

Instead, write to the VCS output pane when reading from/writing to the
process.

Change-Id: Ie832d813d5a859b4ff5841fd2888783833c97945
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
---
 src/plugins/git/mergetool.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/plugins/git/mergetool.h')

diff --git a/src/plugins/git/mergetool.h b/src/plugins/git/mergetool.h
index 3acdd83adb..d9a54e24a0 100644
--- a/src/plugins/git/mergetool.h
+++ b/src/plugins/git/mergetool.h
@@ -30,12 +30,12 @@
 
 QT_BEGIN_NAMESPACE
 class QMessageBox;
+class QProcess;
 QT_END_NAMESPACE
 
 namespace Git {
 namespace Internal {
 
-class MergeToolProcess;
 class GitClient;
 
 class MergeTool : public QObject
@@ -67,6 +67,7 @@ private:
     void prompt(const QString &title, const QString &question);
     void readData();
     void done();
+    void write(const QByteArray &bytes);
 
     FileState waitAndReadStatus(QString &extraInfo);
     QString mergeTypeName();
@@ -74,7 +75,7 @@ private:
     void chooseAction();
     void addButton(QMessageBox *msgBox, const QString &text, char key);
 
-    MergeToolProcess *m_process = nullptr;
+    QProcess *m_process = nullptr;
     MergeType m_mergeType = NormalMerge;
     QString m_fileName;
     FileState m_localState = UnknownState;
-- 
cgit v1.2.1