summaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
authorDaniel Teske <daniel.teske@digia.com>2013-08-08 16:21:56 +0200
committerDaniel Teske <daniel.teske@digia.com>2013-08-12 12:44:29 +0200
commit9e10b0536648ccf1bef25a02c770b47f3eb7f1c9 (patch)
tree18f4f782dc12ef9d512186488611b6efc20f0c26 /src/plugins
parent83bbd534e52437d665b250fe27c3c61e02252e91 (diff)
downloadqt-creator-9e10b0536648ccf1bef25a02c770b47f3eb7f1c9.tar.gz
Android: Ensure that keytool returns english output
Task-number: QTCREATORBUG-9941 Change-Id: I69c3f6aecdf5e4c40934b5151518a0787b752356 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/android/androidpackagecreationstep.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/android/androidpackagecreationstep.cpp b/src/plugins/android/androidpackagecreationstep.cpp
index 1a2484f79b..651cba1c84 100644
--- a/src/plugins/android/androidpackagecreationstep.cpp
+++ b/src/plugins/android/androidpackagecreationstep.cpp
@@ -398,6 +398,9 @@ QAbstractItemModel *AndroidPackageCreationStep::keystoreCertificates()
if (!m_keystorePasswd.length())
return 0;
params << m_keystorePasswd;
+ Utils::Environment env = Utils::Environment::systemEnvironment();
+ env.set(QLatin1String("LANG"), QLatin1String("C"));
+ keytoolProc.setProcessEnvironment(env.toProcessEnvironment());
keytoolProc.start(AndroidConfigurations::instance().keytoolPath().toString(), params);
if (!keytoolProc.waitForStarted() || !keytoolProc.waitForFinished()) {
QMessageBox::critical(0, tr("Error"),