From d484bf9b6fadefc248cc6ee0b0f8f31c079fa85d Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Tue, 25 Mar 2014 13:39:59 +0100 Subject: [PATCH] Android: Ensure that keytool outputs in english Task-number: QTCREATORBUG-11417 Change-Id: Ie94e1b7c149feda9c25554b5eff5862498dda81d Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/plugins/android/androiddeployqtstep.cpp | 4 +--- src/plugins/android/androidpackagecreationstep.cpp | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 23a9da5fb83..7335f5b69e4 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -527,9 +527,7 @@ QAbstractItemModel *AndroidDeployQtStep::keystoreCertificates() if (!m_keystorePasswd.length()) return 0; params << m_keystorePasswd; - Utils::Environment env = Utils::Environment::systemEnvironment(); - env.set(QLatin1String("LC_ALL"), QLatin1String("C")); - keytoolProc.setProcessEnvironment(env.toProcessEnvironment()); + params << QLatin1String("-J\"-Duser.language=en\""); keytoolProc.start(AndroidConfigurations::currentConfig().keytoolPath().toString(), params); if (!keytoolProc.waitForStarted() || !keytoolProc.waitForFinished()) { QMessageBox::critical(0, tr("Error"), diff --git a/src/plugins/android/androidpackagecreationstep.cpp b/src/plugins/android/androidpackagecreationstep.cpp index f36301ebff9..d9a6f66151b 100644 --- a/src/plugins/android/androidpackagecreationstep.cpp +++ b/src/plugins/android/androidpackagecreationstep.cpp @@ -364,9 +364,7 @@ QAbstractItemModel *AndroidPackageCreationStep::keystoreCertificates() if (!m_keystorePasswd.length()) return 0; params << m_keystorePasswd; - Utils::Environment env = Utils::Environment::systemEnvironment(); - env.set(QLatin1String("LC_ALL"), QLatin1String("C")); - keytoolProc.setProcessEnvironment(env.toProcessEnvironment()); + params << QLatin1String("-J\"-Duser.language=en\""); keytoolProc.start(AndroidConfigurations::currentConfig().keytoolPath().toString(), params); if (!keytoolProc.waitForStarted() || !keytoolProc.waitForFinished()) { QMessageBox::critical(0, tr("Error"),