diff options
| author | Daniel Teske <daniel.teske@theqtcompany.com> | 2015-04-16 15:35:02 +0200 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@theqtcompany.com> | 2015-04-16 15:01:13 +0000 |
| commit | 50eab33aac42dcbed2f638fa5e1055d61aa4cae7 (patch) | |
| tree | c37213d1ed93e8fd28fd66668fd3fa2c5d2e08bd | |
| parent | 458bcdf6aa882b8cca628333da2b031b6b799bda (diff) | |
| download | qt-creator-50eab33aac42dcbed2f638fa5e1055d61aa4cae7.tar.gz | |
Android: Detect install failure on Android 5.1
Change-Id: Ib0bb4ff89581a66b21431fe0009003b1f1430021
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
| -rw-r--r-- | src/plugins/android/androiddeployqtstep.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 240fa05682..24a02e511a 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -69,6 +69,7 @@ const QLatin1String VerboseOutputKey("VerboseOutput"); const QLatin1String InputFile("InputFile"); const QLatin1String ProFilePathForInputFile("ProFilePathForInputFile"); const QLatin1String InstallFailedInconsistentCertificatesString("INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES"); +const QLatin1String InstallFailedInconsistentCertificatesString2("INSTALL_FAILED_UPDATE_INCOMPATIBLE"); const Core::Id AndroidDeployQtStep::Id("Qt4ProjectManager.AndroidDeployQtStep"); ////////////////// @@ -480,7 +481,8 @@ void AndroidDeployQtStep::processReadyReadStdOutput() void AndroidDeployQtStep::stdOutput(const QString &line) { - if (line.contains(InstallFailedInconsistentCertificatesString)) + if (line.contains(InstallFailedInconsistentCertificatesString) + || line.contains(InstallFailedInconsistentCertificatesString2)) m_installOk = false; emit addOutput(line, BuildStep::NormalOutput, BuildStep::DontAppendNewline); } @@ -496,7 +498,8 @@ void AndroidDeployQtStep::processReadyReadStdError() void AndroidDeployQtStep::stdError(const QString &line) { - if (line.contains(InstallFailedInconsistentCertificatesString)) + if (line.contains(InstallFailedInconsistentCertificatesString) + || line.contains(InstallFailedInconsistentCertificatesString2)) m_installOk = false; emit addOutput(line, BuildStep::ErrorOutput, BuildStep::DontAppendNewline); } |