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

Android: Fix listing of aliases in keystore

Browse Source 
Task-number: QTCREATORBUG-11339
Change-Id: Id571813ae6c057b76a384c21a2330be908b3ba6e
Reviewed-by: BogDan Vatra <bogdan@kde.org>
This commit is contained in:
Daniel Teske
2014-01-24 12:28:04 +01:00
parent 66a1878558
commit bbcd3046e5
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -528,7 +528,7 @@ QAbstractItemModel *AndroidDeployQtStep::keystoreCertificates()
return 0; return 0;
params << m_keystorePasswd; params << m_keystorePasswd;
Utils::Environment env = Utils::Environment::systemEnvironment(); Utils::Environment env = Utils::Environment::systemEnvironment();
env.set(QLatin1String("LANG"), QLatin1String("C")); env.set(QLatin1String("LC_ALL"), QLatin1String("C"));
keytoolProc.setProcessEnvironment(env.toProcessEnvironment()); 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()) {

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

@@ -365,7 +365,7 @@ QAbstractItemModel *AndroidPackageCreationStep::keystoreCertificates()
return 0; return 0;
params << m_keystorePasswd; params << m_keystorePasswd;
Utils::Environment env = Utils::Environment::systemEnvironment(); Utils::Environment env = Utils::Environment::systemEnvironment();
env.set(QLatin1String("LANG"), QLatin1String("C")); env.set(QLatin1String("LC_ALL"), QLatin1String("C"));
keytoolProc.setProcessEnvironment(env.toProcessEnvironment()); 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()) {