forked from qt-creator/qt-creator
Utils: Delete QtcProcess::{setP,p}rocessEnvironment
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:
@@ -164,6 +164,9 @@ private:
|
||||
|
||||
void setupChildProcess_impl();
|
||||
|
||||
void setProcessEnvironment(const QProcessEnvironment &environment) = delete;
|
||||
QProcessEnvironment processEnvironment() const = delete;
|
||||
|
||||
CommandLine m_commandLine;
|
||||
Environment m_environment;
|
||||
bool m_haveEnv = false;
|
||||
|
@@ -78,14 +78,13 @@ ClangToolRunner::~ClangToolRunner()
|
||||
m_process->deleteLater();
|
||||
}
|
||||
|
||||
void ClangToolRunner::init(const QString &outputDirPath,
|
||||
const Utils::Environment &environment)
|
||||
void ClangToolRunner::init(const QString &outputDirPath, const Environment &environment)
|
||||
{
|
||||
m_outputDirPath = outputDirPath;
|
||||
QTC_CHECK(!m_outputDirPath.isEmpty());
|
||||
|
||||
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.
|
||||
connect(m_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
|
||||
this, &ClangToolRunner::onProcessFinished);
|
||||
|
@@ -122,7 +122,7 @@ void DockerDeviceProcess::start(const Runnable &runnable)
|
||||
disconnect(&m_process);
|
||||
|
||||
m_process.setCommand(runnable.commandLine());
|
||||
m_process.setProcessEnvironment(runnable.environment.toProcessEnvironment());
|
||||
m_process.setEnvironment(runnable.environment);
|
||||
m_process.setWorkingDirectory(runnable.workingDirectory);
|
||||
connect(&m_process, &QProcess::errorOccurred, this, &DeviceProcess::error);
|
||||
connect(&m_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
|
||||
|
Reference in New Issue
Block a user