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

Android: Re-install Qt live on version mismatch

Browse Source 
Use version code to determine the app's version, version
name is only for display

Change-Id: I8e3a8f6b1b8fab2014a762ebabf09b3ce2e0b559
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
This commit is contained in:
Vikas Pachdha
2018-08-07 14:47:08 +02:00
parent 391cfab5d7
commit ca69b8a8a8
3 changed files with 48 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -251,10 +251,27 @@ AndroidDeployQtStep::DeployErrorCode AndroidDeployQtStep::runDeploy(QFutureInter
QTC_ASSERT(rc, return DeployErrorCode::Failure);
const bool deployQtLive = rc->id().name().startsWith(qmlProjectRunConfigIdName);
QString packageName;
int packageVersion = -1;
if (deployQtLive) {
AndroidManager::apkInfo(m_apkPath, &packageName);
if (AndroidManager::packageInstalled(m_serialNumber, packageName))
return DeployErrorCode::NoError;
// Do not install Qt live if apk is already installed or the same version is
// being installed.
AndroidManager::apkInfo(m_apkPath, &packageName, &packageVersion);
if (AndroidManager::packageInstalled(m_serialNumber, packageName)) {
int installedVersion = AndroidManager::packageVersionCode(m_serialNumber,
packageName);
if (installedVersion == packageVersion) {
qCDebug(deployStepLog) << "Qt live APK already installed. APK version:"
<< packageVersion << "Installed version:"
<< installedVersion;
return DeployErrorCode::NoError;
} else {
qCDebug(deployStepLog) << "Re-installing Qt live APK. Version mismatch."
<< "APK version:" << packageVersion
<< "Installed version:" << installedVersion;
}
} else {
qCDebug(deployStepLog) << "Installing Qt live APK. APK version:" << packageVersion;
}
}
if (m_uninstallPreviousPackageRun) {