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

Vcs/Utils: Use Utils::Environment for ShellCommand

Browse Source 
Change-Id: Ica289ab2f83d52270923c4ff4983860cfbe0b494
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-05-04 05:54:54 +02:00
parent f5aa7bd9a1
commit 793d673f39
22 changed files with 72 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/git/gitclient.h
View File

@@ -345,7 +345,7 @@ public:
QStringList synchronousRepositoryBranches(const QString &repositoryURL,
const QString &workingDirectory = QString()) const;
QProcessEnvironment processEnvironment() const override;
Utils::Environment processEnvironment() const override;
bool beginStashScope(const QString &workingDirectory, const QString &command,
StashFlag flag = Default, PushAction pushAction = NoPush);
@@ -400,7 +400,7 @@ private:
void connectRepositoryChanged(const QString & repository, VcsBase::VcsCommand *cmd);
bool executeAndHandleConflicts(const QString &workingDirectory, const QStringList &arguments,
const QString &abortCommand = QString()) const;
bool tryLauchingGitK(const QProcessEnvironment &env,
bool tryLauchingGitK(const Utils::Environment &env,
const QString &workingDirectory,
const QString &fileName,
const QString &gitBinDirectory) const;