summaryrefslogtreecommitdiff
path: root/src/plugins/git/mergetool.h
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2016-09-20 11:05:03 +0300
committerOrgad Shaneh <orgads@gmail.com>2016-09-20 13:23:30 +0000
commitc64b3f98827905b215a9ff95e4fa750596414db7 (patch)
tree0510f2c7a682c32b68fb9eb3d5eaf23084b4b45f /src/plugins/git/mergetool.h
parent0c187a2b12225fa484318c3360c8be32fe065583 (diff)
downloadqt-creator-c64b3f98827905b215a9ff95e4fa750596414db7.tar.gz
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>
Diffstat (limited to 'src/plugins/git/mergetool.h')
-rw-r--r--src/plugins/git/mergetool.h5
1 files changed, 3 insertions, 2 deletions
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;