From 470c95c94be58905bc3202d3b58175add5f576fa Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Wed, 3 May 2023 16:00:22 +0200 Subject: Utils: Rename QtcProcess -> Process Task-number: QTCREATORBUG-29102 Change-Id: Ibc264f9db6a32206e4097766ee3f7d0b35225a5c Reviewed-by: Qt CI Bot Reviewed-by: Reviewed-by: hjk --- src/plugins/git/branchview.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/plugins/git/branchview.cpp') diff --git a/src/plugins/git/branchview.cpp b/src/plugins/git/branchview.cpp index 34f9b546cd..ce3bca3485 100644 --- a/src/plugins/git/branchview.cpp +++ b/src/plugins/git/branchview.cpp @@ -542,10 +542,10 @@ TaskTree *BranchView::onFastForwardMerge(const std::function &callback) const TreeStorage storage; GitClient *client = GitClient::instance(); - const auto setupMergeBase = [=](QtcProcess &process) { + const auto setupMergeBase = [=](Process &process) { client->setupCommand(process, m_repository, {"merge-base", "HEAD", branch}); }; - const auto onMergeBaseDone = [storage](const QtcProcess &process) { + const auto onMergeBaseDone = [storage](const Process &process) { storage->mergeBase = process.cleanedStdOut().trimmed(); }; -- cgit v1.2.1