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:
@@ -130,8 +130,7 @@ VCSBASE_EXPORT Utils::FilePath findRepositoryForFile(const Utils::FilePath &file
|
||||
// Sets up SSH graphical password prompting (note that the latter
|
||||
// requires a terminal-less process) and sets LANG to 'C' to force English
|
||||
// (suppress LOCALE warnings/parse commands output) if desired.
|
||||
VCSBASE_EXPORT void setProcessEnvironment(Utils::Environment *e,
|
||||
bool forceCLocale);
|
||||
VCSBASE_EXPORT void setProcessEnvironment(Utils::Environment *e);
|
||||
// Sets the source of editor contents, can be directory or file.
|
||||
VCSBASE_EXPORT void setSource(Core::IDocument *document, const QString &source);
|
||||
// Returns the source of editor contents.
|
||||
|
Reference in New Issue
Block a user