aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/git/mergetool.cpp
diff options
context:
space:
mode:
authorJarek Kobus <[email protected]>2023-05-03 16:00:22 +0200
committerJarek Kobus <[email protected]>2023-05-04 05:52:16 +0000
commit470c95c94be58905bc3202d3b58175add5f576fa (patch)
tree992c0eea5e7e88f4599a533d2bcbf4bfac472cd9 /src/plugins/git/mergetool.cpp
parente5051bbfdef896ece974a949a392de7337284bf0 (diff)
Utils: Rename QtcProcess -> Process
Task-number: QTCREATORBUG-29102 Change-Id: Ibc264f9db6a32206e4097766ee3f7d0b35225a5c Reviewed-by: Qt CI Bot <[email protected]> Reviewed-by: <[email protected]> Reviewed-by: hjk <[email protected]>
Diffstat (limited to 'src/plugins/git/mergetool.cpp')
-rw-r--r--src/plugins/git/mergetool.cpp4
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");