From 104bbfc7132b7f388ddc1bec4ecece5c9ca01603 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Tue, 5 Apr 2022 17:22:46 +0200 Subject: AndroidSettingsWidget: Connect to QtcProcess::done() signal Instead of connecting to errorOccurred() and finished() signals. Change-Id: If802368f1f084e5990458942b3ef94517a0cfdff Reviewed-by: Alessandro Portale Reviewed-by: --- src/plugins/android/androidsettingswidget.cpp | 31 +++++++++++++-------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'src/plugins/android/androidsettingswidget.cpp') diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index 7fe0d09c70..a2784deaab 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -320,7 +320,7 @@ AndroidSettingsWidget::AndroidSettingsWidget() m_androidSummary = new SummaryWidget(androidValidationPoints, tr("Android settings are OK."), tr("Android settings have errors."), m_ui.androidDetailsWidget); - m_androidProgress = new Utils::ProgressIndicator(ProgressIndicatorSize::Medium, this); + m_androidProgress = new ProgressIndicator(ProgressIndicatorSize::Medium, this); m_androidProgress->attachToWidget(m_ui.androidDetailsWidget); m_androidProgress->hide(); @@ -612,22 +612,21 @@ void AndroidSettingsWidget::downloadOpenSslRepo(const bool silent) openButton->deleteLater(); }; - connect(gitCloner, &QtcProcess::finished, this, [=] { - openSslProgressDialog->close(); - validateOpenSsl(); - m_ui.openSslPathChooser->triggerChanged(); // After cloning, the path exists - - if (!openSslProgressDialog->wasCanceled() - || gitCloner->result() == ProcessResult::FinishedWithError) { - failDialog(); - } - }); - - connect(gitCloner, &QtcProcess::errorOccurred, this, [=](QProcess::ProcessError error) { + connect(gitCloner, &QtcProcess::done, this, [=] { openSslProgressDialog->close(); - if (error == QProcess::FailedToStart) { - failDialog(tr("The Git tool might not be installed properly on your system.")); - } else { + if (gitCloner->error() != QProcess::UnknownError) { + if (gitCloner->error() == QProcess::FailedToStart) { + failDialog(tr("The Git tool might not be installed properly on your system.")); + return; + } else { + failDialog(); + } + } + validateOpenSsl(); + m_ui.openSslPathChooser->triggerChanged(); // After cloning, the path exists + + if (!openSslProgressDialog->wasCanceled() + || gitCloner->result() == ProcessResult::FinishedWithError) { failDialog(); } }); -- cgit v1.2.1