Utils: Make Environment::setEnglishOutput a proper member function

The previous indirection was useful as long as they were overloads
for QProcessEnvironment and QStringList, but these are gone now.

Change-Id: I5066bd2e72fd06948a5cc7bbac6dda9006db96ed
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2021-05-20 11:57:21 +02:00
parent 2be8061930
commit 77d7b24326
11 changed files with 14 additions and 14 deletions

View File

@@ -192,7 +192,7 @@ CMakeBuildStep::CMakeBuildStep(BuildStepList *bsl, Utils::Id id) :
setEnvironmentModifier([](Environment &env) {
const QString ninjaProgressString = "[%f/%t "; // ninja: [33/100
Environment::setupEnglishOutput(&env);
env.setupEnglishOutput();
if (!env.expandedValueForKey("NINJA_STATUS").startsWith(ninjaProgressString))
env.set("NINJA_STATUS", ninjaProgressString + "%o/sec] ");
});

View File

@@ -202,7 +202,7 @@ static FilePath qmakeFromCMakeCache(const CMakeConfig &config)
cmake.setTimeoutS(5);
cmake.setDisableUnixTerminal();
Environment env = Environment::systemEnvironment();
Environment::setupEnglishOutput(&env);
env.setupEnglishOutput();
cmake.setEnvironment(env);
cmake.setTimeOutMessageBoxEnabled(false);

View File

@@ -197,7 +197,7 @@ void CMakeTool::runCMake(SynchronousProcess &cmake, const QStringList &args, int
cmake.setTimeoutS(timeoutS);
cmake.setDisableUnixTerminal();
Environment env = Environment::systemEnvironment();
Environment::setupEnglishOutput(&env);
env.setupEnglishOutput();
cmake.setEnvironment(env);
cmake.setTimeOutMessageBoxEnabled(false);
cmake.setCommand({cmakeExecutable(), args});