diff options
author | Eike Ziller <eike.ziller@digia.com> | 2012-11-26 10:52:28 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@digia.com> | 2012-11-26 10:52:28 +0100 |
commit | 387f5a70065b6a21143f30a693b3946f43145aa1 (patch) | |
tree | 19499220eb78ffc2b83174768e4db33f36d33242 /src/plugins/autotoolsprojectmanager/makestep.cpp | |
parent | c9afad98efee2e9d7eb09407395c8ad00f175f17 (diff) | |
parent | 9820278a708024cc1ae01372dfafabe4ff295b88 (diff) | |
download | qt-creator-387f5a70065b6a21143f30a693b3946f43145aa1.tar.gz |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
src/plugins/cpptools/cppcompletion_test.cpp
src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
src/plugins/qtsupport/baseqtversion.cpp
tests/auto/cplusplus/findusages/tst_findusages.cpp
Change-Id: Idd2abc09753a71a6c252bfa9914274459b2c7e63
Diffstat (limited to 'src/plugins/autotoolsprojectmanager/makestep.cpp')
-rw-r--r-- | src/plugins/autotoolsprojectmanager/makestep.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/autotoolsprojectmanager/makestep.cpp b/src/plugins/autotoolsprojectmanager/makestep.cpp index e3ccbcede6..7716b5c0c2 100644 --- a/src/plugins/autotoolsprojectmanager/makestep.cpp +++ b/src/plugins/autotoolsprojectmanager/makestep.cpp @@ -181,7 +181,11 @@ bool MakeStep::init() ProcessParameters *pp = processParameters(); pp->setMacroExpander(bc->macroExpander()); - pp->setEnvironment(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->setWorkingDirectory(bc->buildDirectory()); pp->setCommand(tc ? tc->makeCommand(bc->environment()) : QLatin1String("make")); pp->setArguments(arguments); |