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

Fix Android package signing

Browse Source 
Change-Id: I80520267e18b30a9deeceeddf1c05a7646e9bc94
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
BogDan Vatra
2012-07-07 16:36:25 +03:00
committed by Daniel Teske
parent 64471a9c4d
commit 7140a685d3
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/android/androiddeploystep.cpp
View File

@@ -102,8 +102,13 @@ bool AndroidDeployStep::init()
QtSupport::BaseQtVersion *version = QtSupport::QtProfileInformation::qtVersion(target()->profile()); QtSupport::BaseQtVersion *version = QtSupport::QtProfileInformation::qtVersion(target()->profile());
if (!version) if (!version)
return false; return false;
const Qt4BuildConfiguration *bc = static_cast<Qt4BuildConfiguration *>(target()->activeBuildConfiguration());
if (!bc)
return false;
m_qtVersionSourcePath = version->sourcePath().toString(); m_qtVersionSourcePath = version->sourcePath().toString();
m_qtVersionQMakeBuildConfig = version->defaultBuildConfig(); m_qtVersionQMakeBuildConfig = bc->qmakeBuildConfiguration();
m_androidDirPath = AndroidManager::dirPath(target()); m_androidDirPath = AndroidManager::dirPath(target());
m_apkPathDebug = AndroidManager::apkPath(target(), AndroidManager::DebugBuild).toString(); m_apkPathDebug = AndroidManager::apkPath(target(), AndroidManager::DebugBuild).toString();
m_apkPathRelease = AndroidManager::apkPath(target(), AndroidManager::ReleaseBuildSigned).toString(); m_apkPathRelease = AndroidManager::apkPath(target(), AndroidManager::ReleaseBuildSigned).toString();

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

@@ -332,7 +332,7 @@ QAbstractItemModel *AndroidPackageCreationStep::keystoreCertificates()
QProcess keytoolProc; QProcess keytoolProc;
while (!rawCerts.length() || !m_keystorePasswd.length()) { while (!rawCerts.length() || !m_keystorePasswd.length()) {
QStringList params; QStringList params;
params << QLatin1String("-list") << QLatin1String("-v") << QLatin1String("-keystore") << m_keystorePathForRun.toUserOutput() << QLatin1String("-storepass"); params << QLatin1String("-list") << QLatin1String("-v") << QLatin1String("-keystore") << m_keystorePath.toUserOutput() << QLatin1String("-storepass");
if (!m_keystorePasswd.length()) if (!m_keystorePasswd.length())
keystorePassword(); keystorePassword();
if (!m_keystorePasswd.length()) if (!m_keystorePasswd.length())