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

Utils: Delete QtcProcess::{setP,p}rocessEnvironment

Browse Source 
Enforces the use of {setE,e}nvironment for better control.

Change-Id: Iffd9ee4604a6735ee886ecc7623a58729ecd245a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-05-04 06:14:13 +02:00
parent 19380100e9
commit d71c725453
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libs/utils/qtcprocess.h
View File

@@ -164,6 +164,9 @@ private:
void setupChildProcess_impl(); void setupChildProcess_impl();
void setProcessEnvironment(const QProcessEnvironment &environment) = delete;
QProcessEnvironment processEnvironment() const = delete;
CommandLine m_commandLine; CommandLine m_commandLine;
Environment m_environment; Environment m_environment;
bool m_haveEnv = false; bool m_haveEnv = false;

5
src/plugins/clangtools/clangtoolrunner.cpp
View File

@@ -78,14 +78,13 @@ ClangToolRunner::~ClangToolRunner()
m_process->deleteLater(); m_process->deleteLater();
} }
void ClangToolRunner::init(const QString &outputDirPath, void ClangToolRunner::init(const QString &outputDirPath, const Environment &environment)
const Utils::Environment &environment)
{ {
m_outputDirPath = outputDirPath; m_outputDirPath = outputDirPath;
QTC_CHECK(!m_outputDirPath.isEmpty()); QTC_CHECK(!m_outputDirPath.isEmpty());
m_process->setProcessChannelMode(QProcess::MergedChannels); m_process->setProcessChannelMode(QProcess::MergedChannels);
m_process->setProcessEnvironment(environment.toProcessEnvironment()); m_process->setEnvironment(environment);
m_process->setWorkingDirectory(m_outputDirPath); // Current clang-cl puts log file into working dir. m_process->setWorkingDirectory(m_outputDirPath); // Current clang-cl puts log file into working dir.
connect(m_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), connect(m_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
this, &ClangToolRunner::onProcessFinished); this, &ClangToolRunner::onProcessFinished);

2
src/plugins/docker/dockerdevice.cpp
View File

@@ -122,7 +122,7 @@ void DockerDeviceProcess::start(const Runnable &runnable)
disconnect(&m_process); disconnect(&m_process);
m_process.setCommand(runnable.commandLine()); m_process.setCommand(runnable.commandLine());
m_process.setProcessEnvironment(runnable.environment.toProcessEnvironment()); m_process.setEnvironment(runnable.environment);
m_process.setWorkingDirectory(runnable.workingDirectory); m_process.setWorkingDirectory(runnable.workingDirectory);
connect(&m_process, &QProcess::errorOccurred, this, &DeviceProcess::error); connect(&m_process, &QProcess::errorOccurred, this, &DeviceProcess::error);
connect(&m_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), connect(&m_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),