forked from qt-creator/qt-creator
ShellCommand: De-virtualize environment()
Provide instead a protected setter, used in VcsCommand c'tor. Remove a forceCLocale arg from setProcessEnvironment() method, as it is used only in VcsCommand context when ShellCommand::ForceCLocale flag was set. Move setting C locale env directly to the shell command, just before the command is executed, so that we are sure the flag was already set. Modify env directly in VcsCommand c'tor with regards to SSH_ASKPASS variable. Change-Id: Icff555ade4984368f7ce79f762d1bb5d3614076a Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
@@ -134,7 +134,7 @@ void VcsBaseClientImpl::enqueueJob(ShellCommand *cmd, const QStringList &args,
|
||||
Environment VcsBaseClientImpl::processEnvironment() const
|
||||
{
|
||||
Environment environment = Environment::systemEnvironment();
|
||||
VcsBase::setProcessEnvironment(&environment, false);
|
||||
VcsBase::setProcessEnvironment(&environment);
|
||||
return environment;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user