feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Use QtcProcess in GitClient

Browse Source 
Change-Id: Ia92d803ea8f647681ab5ffe51fa9a55bd5924df7
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2021-08-20 08:44:58 +02:00
parent dce88c29a7
commit 2adaea866f
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/git/gitclient.cpp
View File

@@ -2561,9 +2561,9 @@ void GitClient::launchGitK(const FilePath &workingDirectory, const QString &file
void GitClient::launchRepositoryBrowser(const FilePath &workingDirectory) const
{
const QString repBrowserBinary = settings().repositoryBrowserCmd.value();
const FilePath repBrowserBinary = settings().repositoryBrowserCmd.filePath();
if (!repBrowserBinary.isEmpty())
QProcess::startDetached(repBrowserBinary, {workingDirectory.toString()}, workingDirectory.toString());
QtcProcess::startDetached({repBrowserBinary, {workingDirectory.toString()}}, workingDirectory);
}
bool GitClient::tryLauchingGitK(const Environment &env,
@@ -2591,18 +2591,18 @@ bool GitClient::tryLauchingGitK(const Environment &env,
// the child), but that does not have an environment parameter.
bool success = false;
if (!settings().path.value().isEmpty()) {
auto process = new QProcess;
process->setWorkingDirectory(workingDirectory.toString());
process->setProcessEnvironment(env.toProcessEnvironment());
process->start(binary.toString(), arguments);
auto process = new QtcProcess;
process->setWorkingDirectory(workingDirectory);
process->setEnvironment(env);
process->setCommand({binary, arguments});
process->start();
success = process->waitForStarted();
if (success)
connect(process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
process, &QProcess::deleteLater);
connect(process, &QtcProcess::finished, process, &QProcess::deleteLater);
else
delete process;
} else {
success = QProcess::startDetached(binary.toString(), arguments, workingDirectory.toString());
success = QtcProcess::startDetached({binary, arguments}, workingDirectory);
}
return success;