diff --git a/src/libs/utils/shellcommand.cpp b/src/libs/utils/shellcommand.cpp index 6d7d032719f..15ddd709c1a 100644 --- a/src/libs/utils/shellcommand.cpp +++ b/src/libs/utils/shellcommand.cpp @@ -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) diff --git a/src/libs/utils/shellcommand.h b/src/libs/utils/shellcommand.h index 72cf360fb24..30167fd2af8 100644 --- a/src/libs/utils/shellcommand.h +++ b/src/libs/utils/shellcommand.h @@ -106,7 +106,6 @@ public: void abort(); const FilePath &defaultWorkingDirectory() const; - virtual const Environment processEnvironment() const; int defaultTimeoutS() const; void setDefaultTimeoutS(int timeout); @@ -149,6 +148,7 @@ signals: void appendMessage(const QString &text); protected: + virtual Environment environment() const; virtual void addTask(QFuture &future); void setDisableUnixTerminal(); int timeoutS() const; diff --git a/src/plugins/vcsbase/vcscommand.cpp b/src/plugins/vcsbase/vcscommand.cpp index c73a8471b6f..1bd49cdafea 100644 --- a/src/plugins/vcsbase/vcscommand.cpp +++ b/src/plugins/vcsbase/vcscommand.cpp @@ -76,9 +76,9 @@ VcsCommand::VcsCommand(const FilePath &workingDirectory, const Environment &envi connect(this, &ShellCommand::appendMessage, outputWindow, &VcsOutputWindow::appendMessage); } -const Environment VcsCommand::processEnvironment() const +Environment VcsCommand::environment() const { - Environment env = ShellCommand::processEnvironment(); + Environment env = ShellCommand::environment(); VcsBase::setProcessEnvironment(&env, flags() & ForceCLocale, m_sshPrompt); return env; } diff --git a/src/plugins/vcsbase/vcscommand.h b/src/plugins/vcsbase/vcscommand.h index 3748c0ad284..ebb3e271fd1 100644 --- a/src/plugins/vcsbase/vcscommand.h +++ b/src/plugins/vcsbase/vcscommand.h @@ -48,13 +48,12 @@ public: VcsCommand(const Utils::FilePath &defaultWorkingDirectory, const Utils::Environment &environment); - const Utils::Environment processEnvironment() const override; - void runCommand(Utils::QtcProcess &process, const Utils::CommandLine &command, const Utils::FilePath &workDirectory = {}) override; protected: + Utils::Environment environment() const override; void addTask(QFuture &future) override; private: