feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Fix build path with non-latin characters

Browse Source 
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: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Eskil Abrahamsen Blomfeldt
2013-12-17 10:37:19 +01:00
parent 74cc163a06
commit 4b40cda342
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/android/androiddeployqtstep.cpp
View File

@@ -271,9 +271,6 @@ bool AndroidDeployQtStep::init()
pp->setMacroExpander(bc->macroExpander());
pp->setWorkingDirectory(bc->buildDirectory().toString());
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->setCommand(command);
pp->setArguments(Utils::QtcProcess::joinArgs(arguments));