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

7
src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp
View File

@@ -30,6 +30,8 @@
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/progressmanager/progressmanager.h>
#include <diffeditor/diffutils.h>
#include <utils/environment.h>
#include <utils/qtcassert.h>
#include <utils/runextensions.h>
@@ -37,6 +39,7 @@
using namespace DiffEditor;
using namespace Core;
using namespace Utils;
namespace VcsBase {
@@ -93,7 +96,7 @@ public:
VcsBaseDiffEditorController *q;
QString m_directory;
QProcessEnvironment m_processEnvironment;
Environment m_processEnvironment;
Utils::FilePath m_vcsBinary;
int m_vscTimeoutS;
QString m_startupFile;
@@ -294,7 +297,7 @@ void VcsBaseDiffEditorController::setVcsBinary(const Utils::FilePath &path)
d->m_vcsBinary = path;
}
void VcsBaseDiffEditorController::setProcessEnvironment(const QProcessEnvironment &value)
void VcsBaseDiffEditorController::setProcessEnvironment(const Environment &value)
{
d->m_processEnvironment = value;
}