Commit 4b40cda3 authored by Eskil Abrahamsen Blomfeldt's avatar Eskil Abrahamsen Blomfeldt
Browse files

Android: Fix build path with non-latin characters



androiddeployqt uses toLocal8Bit() to get the correct
encoding for executing shell commands, which is broken when
Creator sets the process locale to something different from
the shell. This caused build failures for all users on systems
where the default build path is translated to something which
contains non-latin characters.

Task-number: QTBUG-34316
Change-Id: I4e7dd0d3351d164b720f042bb21f668589df5527
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
parent 74cc163a
...@@ -271,9 +271,6 @@ bool AndroidDeployQtStep::init() ...@@ -271,9 +271,6 @@ bool AndroidDeployQtStep::init()
pp->setMacroExpander(bc->macroExpander()); pp->setMacroExpander(bc->macroExpander());
pp->setWorkingDirectory(bc->buildDirectory().toString()); pp->setWorkingDirectory(bc->buildDirectory().toString());
Utils::Environment env = bc->environment(); Utils::Environment env = bc->environment();
// Force output to english for the parsers. Do this here and not in the toolchain's
// addToEnvironment() to not screw up the users run environment.
env.set(QLatin1String("LC_ALL"), QLatin1String("C"));
pp->setEnvironment(env); pp->setEnvironment(env);
pp->setCommand(command); pp->setCommand(command);
pp->setArguments(Utils::QtcProcess::joinArgs(arguments)); pp->setArguments(Utils::QtcProcess::joinArgs(arguments));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment