From d71c725453b7a3ac6f1c9af4752ab2f4324d1a3f Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 4 May 2021 06:14:13 +0200 Subject: [PATCH] Utils: Delete QtcProcess::{setP,p}rocessEnvironment Enforces the use of {setE,e}nvironment for better control. Change-Id: Iffd9ee4604a6735ee886ecc7623a58729ecd245a Reviewed-by: Christian Stenger --- src/libs/utils/qtcprocess.h | 3 +++ src/plugins/clangtools/clangtoolrunner.cpp | 5 ++--- src/plugins/docker/dockerdevice.cpp | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/libs/utils/qtcprocess.h b/src/libs/utils/qtcprocess.h index 344cbeb388b..47ddfc409a6 100644 --- a/src/libs/utils/qtcprocess.h +++ b/src/libs/utils/qtcprocess.h @@ -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; diff --git a/src/plugins/clangtools/clangtoolrunner.cpp b/src/plugins/clangtools/clangtoolrunner.cpp index 96728fc21fa..78eb5764ca9 100644 --- a/src/plugins/clangtools/clangtoolrunner.cpp +++ b/src/plugins/clangtools/clangtoolrunner.cpp @@ -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::of(&QProcess::finished), this, &ClangToolRunner::onProcessFinished); diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp index 14a771894b2..06a1a617c52 100644 --- a/src/plugins/docker/dockerdevice.cpp +++ b/src/plugins/docker/dockerdevice.cpp @@ -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::of(&QProcess::finished),