diff options
Diffstat (limited to 'src/plugins/git/mergetool.cpp')
-rw-r--r-- | src/plugins/git/mergetool.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/git/mergetool.cpp b/src/plugins/git/mergetool.cpp index f696bef124c..6fbc9d5ea83 100644 --- a/src/plugins/git/mergetool.cpp +++ b/src/plugins/git/mergetool.cpp @@ -23,8 +23,8 @@ namespace Git::Internal { MergeTool::MergeTool(QObject *parent) : QObject(parent) { - connect(&m_process, &QtcProcess::done, this, &MergeTool::done); - connect(&m_process, &QtcProcess::readyReadStandardOutput, this, &MergeTool::readData); + connect(&m_process, &Process::done, this, &MergeTool::done); + connect(&m_process, &Process::readyReadStandardOutput, this, &MergeTool::readData); Environment env = Environment::systemEnvironment(); env.set("LANG", "C"); env.set("LANGUAGE", "C"); |