diff --git a/src/plugins/android/androiddeploystep.cpp b/src/plugins/android/androiddeploystep.cpp index 1eccb557818..fa9c56ad0c6 100644 --- a/src/plugins/android/androiddeploystep.cpp +++ b/src/plugins/android/androiddeploystep.cpp @@ -102,8 +102,13 @@ bool AndroidDeployStep::init() QtSupport::BaseQtVersion *version = QtSupport::QtProfileInformation::qtVersion(target()->profile()); if (!version) return false; + + const Qt4BuildConfiguration *bc = static_cast(target()->activeBuildConfiguration()); + if (!bc) + return false; + m_qtVersionSourcePath = version->sourcePath().toString(); - m_qtVersionQMakeBuildConfig = version->defaultBuildConfig(); + m_qtVersionQMakeBuildConfig = bc->qmakeBuildConfiguration(); m_androidDirPath = AndroidManager::dirPath(target()); m_apkPathDebug = AndroidManager::apkPath(target(), AndroidManager::DebugBuild).toString(); m_apkPathRelease = AndroidManager::apkPath(target(), AndroidManager::ReleaseBuildSigned).toString(); diff --git a/src/plugins/android/androidpackagecreationstep.cpp b/src/plugins/android/androidpackagecreationstep.cpp index ed289711927..1d4ba4c30e4 100644 --- a/src/plugins/android/androidpackagecreationstep.cpp +++ b/src/plugins/android/androidpackagecreationstep.cpp @@ -332,7 +332,7 @@ QAbstractItemModel *AndroidPackageCreationStep::keystoreCertificates() QProcess keytoolProc; while (!rawCerts.length() || !m_keystorePasswd.length()) { 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()) keystorePassword(); if (!m_keystorePasswd.length())