aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/git/mergetool.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/git/mergetool.h')
-rw-r--r--src/plugins/git/mergetool.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/git/mergetool.h b/src/plugins/git/mergetool.h
index 290b50f10c..727f9a85df 100644
--- a/src/plugins/git/mergetool.h
+++ b/src/plugins/git/mergetool.h
@@ -3,7 +3,7 @@
#pragma once
-#include <utils/qtcprocess.h>
+#include <utils/process.h>
#include <QObject>
#include <QStringList>
@@ -49,7 +49,7 @@ private:
void chooseAction();
void addButton(QMessageBox *msgBox, const QString &text, char key);
- Utils::QtcProcess m_process;
+ Utils::Process m_process;
MergeType m_mergeType = NormalMerge;
QString m_fileName;
FileState m_localState = UnknownState;