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

Android: Ensure that keytool outputs in english

Browse Source 
Task-number: QTCREATORBUG-11417
Change-Id: Ie94e1b7c149feda9c25554b5eff5862498dda81d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
This commit is contained in:
Daniel Teske
2014-03-25 13:39:59 +01:00
parent 866157960a
commit d484bf9b6f
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -527,9 +527,7 @@ QAbstractItemModel *AndroidDeployQtStep::keystoreCertificates()
if (!m_keystorePasswd.length()) if (!m_keystorePasswd.length())
return 0; return 0;
params << m_keystorePasswd; params << m_keystorePasswd;
Utils::Environment env = Utils::Environment::systemEnvironment(); params << QLatin1String("-J\"-Duser.language=en\"");
env.set(QLatin1String("LC_ALL"), QLatin1String("C"));
keytoolProc.setProcessEnvironment(env.toProcessEnvironment());
keytoolProc.start(AndroidConfigurations::currentConfig().keytoolPath().toString(), params); keytoolProc.start(AndroidConfigurations::currentConfig().keytoolPath().toString(), params);
if (!keytoolProc.waitForStarted() || !keytoolProc.waitForFinished()) { if (!keytoolProc.waitForStarted() || !keytoolProc.waitForFinished()) {
QMessageBox::critical(0, tr("Error"), QMessageBox::critical(0, tr("Error"),

4
src/plugins/android/androidpackagecreationstep.cpp
View File

@@ -364,9 +364,7 @@ QAbstractItemModel *AndroidPackageCreationStep::keystoreCertificates()
if (!m_keystorePasswd.length()) if (!m_keystorePasswd.length())
return 0; return 0;
params << m_keystorePasswd; params << m_keystorePasswd;
Utils::Environment env = Utils::Environment::systemEnvironment(); params << QLatin1String("-J\"-Duser.language=en\"");
env.set(QLatin1String("LC_ALL"), QLatin1String("C"));
keytoolProc.setProcessEnvironment(env.toProcessEnvironment());
keytoolProc.start(AndroidConfigurations::currentConfig().keytoolPath().toString(), params); keytoolProc.start(AndroidConfigurations::currentConfig().keytoolPath().toString(), params);
if (!keytoolProc.waitForStarted() || !keytoolProc.waitForFinished()) { if (!keytoolProc.waitForStarted() || !keytoolProc.waitForFinished()) {
QMessageBox::critical(0, tr("Error"), QMessageBox::critical(0, tr("Error"),