diff options
| author | Daniel Teske <daniel.teske@digia.com> | 2014-01-24 12:28:04 +0100 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@digia.com> | 2014-01-29 15:51:46 +0100 |
| commit | bbcd3046e5e73b29836819d5ec6e2dd833314bfe (patch) | |
| tree | c2ead0b183189cac957ef2fa93aa9be0c28dc38f | |
| parent | 66a18785589aac5c6bcb0683e176bf937156199b (diff) | |
| download | qt-creator-bbcd3046e5e73b29836819d5ec6e2dd833314bfe.tar.gz | |
Android: Fix listing of aliases in keystore
Task-number: QTCREATORBUG-11339
Change-Id: Id571813ae6c057b76a384c21a2330be908b3ba6e
Reviewed-by: BogDan Vatra <bogdan@kde.org>
| -rw-r--r-- | src/plugins/android/androiddeployqtstep.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/android/androidpackagecreationstep.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index cacb2f37d9..cc078ec410 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -528,7 +528,7 @@ QAbstractItemModel *AndroidDeployQtStep::keystoreCertificates() return 0; params << m_keystorePasswd; Utils::Environment env = Utils::Environment::systemEnvironment(); - env.set(QLatin1String("LANG"), QLatin1String("C")); + env.set(QLatin1String("LC_ALL"), QLatin1String("C")); keytoolProc.setProcessEnvironment(env.toProcessEnvironment()); keytoolProc.start(AndroidConfigurations::currentConfig().keytoolPath().toString(), params); if (!keytoolProc.waitForStarted() || !keytoolProc.waitForFinished()) { diff --git a/src/plugins/android/androidpackagecreationstep.cpp b/src/plugins/android/androidpackagecreationstep.cpp index e0ead603ff..f36301ebff 100644 --- a/src/plugins/android/androidpackagecreationstep.cpp +++ b/src/plugins/android/androidpackagecreationstep.cpp @@ -365,7 +365,7 @@ QAbstractItemModel *AndroidPackageCreationStep::keystoreCertificates() return 0; params << m_keystorePasswd; Utils::Environment env = Utils::Environment::systemEnvironment(); - env.set(QLatin1String("LANG"), QLatin1String("C")); + env.set(QLatin1String("LC_ALL"), QLatin1String("C")); keytoolProc.setProcessEnvironment(env.toProcessEnvironment()); keytoolProc.start(AndroidConfigurations::currentConfig().keytoolPath().toString(), params); if (!keytoolProc.waitForStarted() || !keytoolProc.waitForFinished()) { |