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

Utils: Remove SynchronousProcess::{setP,p}rocessEnvironment

Browse Source 
Change-Id: I761c04a08bc7e52b2d57d90cb8aa93ec9f3db724
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2021-04-30 18:26:57 +02:00
parent 793d673f39
commit c69eb63767
5 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libs/utils/synchronousprocess.cpp
View File

@@ -410,16 +410,6 @@ void SynchronousProcess::setEnvironment(const Environment &e)
d->m_process.setEnvironment(Environment(e)); d->m_process.setEnvironment(Environment(e));
} }
void SynchronousProcess::setProcessEnvironment(const QProcessEnvironment &environment)
{
d->m_process.setProcessEnvironment(environment);
}
QProcessEnvironment SynchronousProcess::processEnvironment() const
{
return d->m_process.processEnvironment();
}
unsigned SynchronousProcess::flags() const unsigned SynchronousProcess::flags() const
{ {
return d->m_process.flags(); return d->m_process.flags();

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

@@ -116,9 +116,6 @@ public:
Environment environment() const; Environment environment() const;
void setEnvironment(const Environment &); void setEnvironment(const Environment &);
void setProcessEnvironment(const QProcessEnvironment &environment);
QProcessEnvironment processEnvironment() const;
void setWorkingDirectory(const QString &workingDirectory); void setWorkingDirectory(const QString &workingDirectory);
QString workingDirectory() const; QString workingDirectory() const;

2
src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
View File

@@ -203,7 +203,7 @@ static FilePath qmakeFromCMakeCache(const CMakeConfig &config)
cmake.setFlags(SynchronousProcess::UnixTerminalDisabled); cmake.setFlags(SynchronousProcess::UnixTerminalDisabled);
Environment env = Environment::systemEnvironment(); Environment env = Environment::systemEnvironment();
Environment::setupEnglishOutput(&env); Environment::setupEnglishOutput(&env);
cmake.setProcessEnvironment(env.toProcessEnvironment()); cmake.setEnvironment(env);
cmake.setTimeOutMessageBoxEnabled(false); cmake.setTimeOutMessageBoxEnabled(false);
QString cmakeGenerator QString cmakeGenerator

2
src/plugins/cmakeprojectmanager/cmaketool.cpp
View File

@@ -196,7 +196,7 @@ Utils::SynchronousProcessResponse CMakeTool::run(const QStringList &args, int ti
cmake.setFlags(Utils::SynchronousProcess::UnixTerminalDisabled); cmake.setFlags(Utils::SynchronousProcess::UnixTerminalDisabled);
Utils::Environment env = Utils::Environment::systemEnvironment(); Utils::Environment env = Utils::Environment::systemEnvironment();
Utils::Environment::setupEnglishOutput(&env); Utils::Environment::setupEnglishOutput(&env);
cmake.setProcessEnvironment(env.toProcessEnvironment()); cmake.setEnvironment(env);
cmake.setTimeOutMessageBoxEnabled(false); cmake.setTimeOutMessageBoxEnabled(false);
return cmake.runBlocking({cmakeExecutable(), args}); return cmake.runBlocking({cmakeExecutable(), args});

17
src/plugins/perforce/perforceplugin.cpp
View File

@@ -106,10 +106,10 @@ static inline QStringList perforceRelativeProjectDirectory(const VcsBasePluginSt
} }
// Clean user setting off diff-binary for 'p4 resolve' and 'p4 diff'. // Clean user setting off diff-binary for 'p4 resolve' and 'p4 diff'.
static inline QProcessEnvironment overrideDiffEnvironmentVariable() static Environment overrideDiffEnvironmentVariable()
{ {
QProcessEnvironment rc = QProcessEnvironment::systemEnvironment(); Environment rc = Environment::systemEnvironment();
rc.remove(QLatin1String("P4DIFF")); rc.unset("P4DIFF");
return rc; return rc;
} }
@@ -1255,7 +1255,7 @@ PerforceResponse PerforcePluginPrivate::synchronousProcess(const QString &workin
if (outputCodec) if (outputCodec)
process.setCodec(outputCodec); process.setCodec(outputCodec);
if (flags & OverrideDiffEnvironment) if (flags & OverrideDiffEnvironment)
process.setProcessEnvironment(overrideDiffEnvironmentVariable()); process.setEnvironment(overrideDiffEnvironmentVariable());
if (!workingDir.isEmpty()) if (!workingDir.isEmpty())
process.setWorkingDirectory(workingDir); process.setWorkingDirectory(workingDir);
@@ -1317,15 +1317,16 @@ PerforceResponse PerforcePluginPrivate::fullySynchronousProcess(const QString &w
const QByteArray &stdInput, const QByteArray &stdInput,
QTextCodec *outputCodec) const QTextCodec *outputCodec) const
{ {
QProcess process; QtcProcess process;
if (flags & OverrideDiffEnvironment) if (flags & OverrideDiffEnvironment)
process.setProcessEnvironment(overrideDiffEnvironmentVariable()); process.setEnvironment(overrideDiffEnvironmentVariable());
if (!workingDir.isEmpty()) if (!workingDir.isEmpty())
process.setWorkingDirectory(workingDir); process.setWorkingDirectory(workingDir);
PerforceResponse response; PerforceResponse response;
process.start(m_settings.p4BinaryPath.value(), args); process.setCommand({m_settings.p4BinaryPath.value(), args});
process.start();
if (stdInput.isEmpty()) if (stdInput.isEmpty())
process.closeWriteChannel(); process.closeWriteChannel();
@@ -1336,7 +1337,7 @@ PerforceResponse PerforcePluginPrivate::fullySynchronousProcess(const QString &w
} }
if (!stdInput.isEmpty()) { if (!stdInput.isEmpty()) {
if (process.write(stdInput) == -1) { if (process.write(stdInput) == -1) {
SynchronousProcess::stopProcess(process); process.stopProcess();
response.error = true; response.error = true;
response.message = tr("Unable to write input data to process %1: %2"). response.message = tr("Unable to write input data to process %1: %2").
arg(QDir::toNativeSeparators(m_settings.p4BinaryPath.value()), arg(QDir::toNativeSeparators(m_settings.p4BinaryPath.value()),