diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2023-05-03 16:00:22 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2023-05-04 05:52:16 +0000 |
| commit | 470c95c94be58905bc3202d3b58175add5f576fa (patch) | |
| tree | 992c0eea5e7e88f4599a533d2bcbf4bfac472cd9 /src/plugins/git/branchview.cpp | |
| parent | e5051bbfdef896ece974a949a392de7337284bf0 (diff) | |
| download | qt-creator-470c95c94be58905bc3202d3b58175add5f576fa.tar.gz | |
Utils: Rename QtcProcess -> Process
Task-number: QTCREATORBUG-29102
Change-Id: Ibc264f9db6a32206e4097766ee3f7d0b35225a5c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/git/branchview.cpp')
| -rw-r--r-- | src/plugins/git/branchview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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<void()> &callback) const TreeStorage<FastForwardStorage> 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(); }; |