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

Android: Don't check QtcProcess exit code

Browse Source 
This is already baked into QtcProcess::Result.

Change-Id: I02b017c7d26b5c42ea4e00cea5c3b393274edfdc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2021-05-28 13:29:05 +02:00
parent c756d8d2d5
commit e2cf0b52a7
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/androidavdmanager.cpp
View File

@@ -204,7 +204,7 @@ bool AndroidAvdManager::removeAvd(const QString &name) const
proc.setTimeoutS(5);
proc.setCommand(command);
proc.runBlocking();
return proc.result() == QtcProcess::FinishedWithSuccess && proc.exitCode() == 0;
return proc.result() == QtcProcess::FinishedWithSuccess;
}
static void avdConfigEditManufacturerTag(const QString &avdPathStr, bool recoverMode = false)

2
src/plugins/android/androidcreatekeystorecertificate.cpp
View File

@@ -202,7 +202,7 @@ void AndroidCreateKeystoreCertificate::buttonBoxAccepted()
genKeyCertProc.setProcessUserEventWhileRunning();
genKeyCertProc.runBlocking();
if (genKeyCertProc.result() != QtcProcess::FinishedWithSuccess || genKeyCertProc.exitCode() != 0) {
if (genKeyCertProc.result() != QtcProcess::FinishedWithSuccess) {
QMessageBox::critical(this, tr("Error"),
genKeyCertProc.exitMessage() + '\n' + genKeyCertProc.allOutput());
return;

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

@@ -485,7 +485,7 @@ void AndroidDeployQtStep::runCommand(const CommandLine &command)
buildProc.setCommand(command);
buildProc.setProcessUserEventWhileRunning();
buildProc.runBlocking();
if (buildProc.result() != QtcProcess::FinishedWithSuccess || buildProc.exitCode() != 0) {
if (buildProc.result() != QtcProcess::FinishedWithSuccess) {
const QString error = buildProc.exitMessage();
emit addOutput(error, OutputFormat::ErrorMessage);
TaskHub::addTask(DeploymentTask(Task::Error, error));

6
src/plugins/android/androidmanager.cpp
View File

@@ -539,7 +539,7 @@ bool AndroidManager::checkKeystorePassword(const QString &keystorePath, const QS
proc.setCommand(cmd);
proc.setProcessUserEventWhileRunning();
proc.runBlocking();
return proc.result() == QtcProcess::FinishedWithSuccess && proc.exitCode() == 0;
return proc.result() == QtcProcess::FinishedWithSuccess;
}
bool AndroidManager::checkCertificatePassword(const QString &keystorePath, const QString &keystorePasswd, const QString &alias, const QString &certificatePasswd)
@@ -557,7 +557,7 @@ bool AndroidManager::checkCertificatePassword(const QString &keystorePath, const
proc.setCommand({AndroidConfigurations::currentConfig().keytoolPath(), arguments});
proc.setProcessUserEventWhileRunning();
proc.runBlocking();
return proc.result() == QtcProcess::FinishedWithSuccess && proc.exitCode() == 0;
return proc.result() == QtcProcess::FinishedWithSuccess;
}
bool AndroidManager::checkCertificateExists(const QString &keystorePath,
@@ -572,7 +572,7 @@ bool AndroidManager::checkCertificateExists(const QString &keystorePath,
proc.setCommand({AndroidConfigurations::currentConfig().keytoolPath(), arguments});
proc.setProcessUserEventWhileRunning();
proc.runBlocking();
return proc.result() == QtcProcess::FinishedWithSuccess && proc.exitCode() == 0;
return proc.result() == QtcProcess::FinishedWithSuccess;
}
using GradleProperties = QMap<QByteArray, QByteArray>;