diff options
| author | Vikas Pachdha <vikas.pachdha@qt.io> | 2017-02-24 11:20:05 +0100 |
|---|---|---|
| committer | Vikas Pachdha <vikas.pachdha@qt.io> | 2017-02-24 14:02:11 +0000 |
| commit | 0e814daa5ebb101a8647b657af0b0c8b4e82feb8 (patch) | |
| tree | 6e7f906676e794059bf034314362b9b2e1859bf8 | |
| parent | fe27f947b916a6b7333be50127c219bafb3d2353 (diff) | |
| download | qt-creator-0e814daa5ebb101a8647b657af0b0c8b4e82feb8.tar.gz | |
Android: Ask to uninstall the app on version downgrade
Deploy step succeeds with error INSTALL_FAILED_VERSION_DOWNGRADE
Task-number: QTCREATORBUG-17789
Change-Id: Ib1c3023cbea7df1802ce967f10b549db7208aa17
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| -rw-r--r-- | src/plugins/android/androiddeployqtstep.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/android/androiddeployqtstep.h | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index f76d50708d..caa694fd0a 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -64,6 +64,7 @@ const QLatin1String UninstallPreviousPackageKey("UninstallPreviousPackage"); const QLatin1String InstallFailedInconsistentCertificatesString("INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES"); const QLatin1String InstallFailedUpdateIncompatible("INSTALL_FAILED_UPDATE_INCOMPATIBLE"); const QLatin1String InstallFailedPermissionModelDowngrade("INSTALL_FAILED_PERMISSION_MODEL_DOWNGRADE"); +const QLatin1String InstallFailedVersionDowngrade("INSTALL_FAILED_VERSION_DOWNGRADE"); const Core::Id AndroidDeployQtStep::Id("Qt4ProjectManager.AndroidDeployQtStep"); ////////////////// @@ -389,6 +390,9 @@ void AndroidDeployQtStep::slotAskForUninstall(DeployErrorCode errorCode) case UpdateIncompatible: uninstallMsg += InstallFailedUpdateIncompatible+"\n"; break; + case VersionDowngrade: + uninstallMsg += InstallFailedVersionDowngrade+"\n"; + break; default: break; } @@ -517,6 +521,8 @@ AndroidDeployQtStep::DeployErrorCode AndroidDeployQtStep::parseDeployErrors(QStr errorCode |= UpdateIncompatible; if (deployOutputLine.contains(InstallFailedPermissionModelDowngrade)) errorCode |= PermissionModelDowngrade; + if (deployOutputLine.contains(InstallFailedVersionDowngrade)) + errorCode |= VersionDowngrade; return errorCode; } diff --git a/src/plugins/android/androiddeployqtstep.h b/src/plugins/android/androiddeployqtstep.h index 2fb85d8223..734fc80545 100644 --- a/src/plugins/android/androiddeployqtstep.h +++ b/src/plugins/android/androiddeployqtstep.h @@ -66,7 +66,8 @@ class AndroidDeployQtStep : public ProjectExplorer::BuildStep InconsistentCertificates = 0x0001, UpdateIncompatible = 0x0002, PermissionModelDowngrade = 0x0004, - Failure = 0x0008 + VersionDowngrade = 0x0008, + Failure = 0x0010 }; public: |