forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -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();
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user