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

ShellCommand: Make processEnvironment() protected

Browse Source 
Rename it to environment().

Change-Id: Ib393ea09d324cbd86b0b74ac928fcb37f243f8fc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2022-07-12 12:25:43 +02:00
parent 05f9769d91
commit 975baf23ac
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/utils/shellcommand.cpp
View File

@@ -152,7 +152,7 @@ const FilePath &ShellCommand::defaultWorkingDirectory() const
return d->m_defaultWorkingDirectory;
}
const Environment ShellCommand::processEnvironment() const
Environment ShellCommand::environment() const
{
return d->m_environment;
}
@@ -328,7 +328,7 @@ void ShellCommand::runFullySynchronous(QtcProcess &process, const FilePath &work
const FilePath dir = workDirectory(workingDirectory);
if (!dir.isEmpty())
process.setWorkingDirectory(dir);
process.setEnvironment(processEnvironment());
process.setEnvironment(environment());
if (d->m_flags & MergeOutputChannels)
process.setProcessChannelMode(QProcess::MergedChannels);
if (d->m_codec)
@@ -357,7 +357,7 @@ void ShellCommand::runSynchronous(QtcProcess &process, const FilePath &workingDi
process.stop();
process.waitForFinished();
});
process.setEnvironment(processEnvironment());
process.setEnvironment(environment());
if (d->m_codec)
process.setCodec(d->m_codec);
if (d->m_disableUnixTerminal)