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

Merge remote-tracking branch 'origin/3.4'

Browse Source
This commit is contained in:
Eike Ziller
2015-04-23 09:39:09 +02:00
parent c2c18b3c8e c92adf5ab4
commit 6c2c505228
34 changed files with 357 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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");
//////////////////
@@ -490,7 +491,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);
}
@@ -506,7 +508,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);
}