summaryrefslogtreecommitdiff
path: root/src/plugins/android/androidsettingswidget.cpp
diff options
context:
space:
mode:
authorAssam Boudjelthia <assam.boudjelthia@qt.io>2021-05-28 18:22:44 +0300
committerAssam Boudjelthia <assam.boudjelthia@qt.io>2021-06-01 08:11:56 +0000
commit1372dfdf7fc5e0ee04c064568bcd6e45da019db5 (patch)
treec5a5773549e95b4777ec200b1a9ab8bb937d3cf3 /src/plugins/android/androidsettingswidget.cpp
parent41240ed70679ccd565c60fafd0b99aed5cb132e6 (diff)
downloadqt-creator-1372dfdf7fc5e0ee04c064568bcd6e45da019db5.tar.gz
Android: Fix multiple clang clazy warnings
Change-Id: I2ea6cebd16c09a8a4502f4719d99a9d85e5e7d02 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'src/plugins/android/androidsettingswidget.cpp')
-rw-r--r--src/plugins/android/androidsettingswidget.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp
index 4e57b1868b..1e566eb3c0 100644
--- a/src/plugins/android/androidsettingswidget.cpp
+++ b/src/plugins/android/androidsettingswidget.cpp
@@ -298,8 +298,8 @@ void AndroidSettingsWidget::showEvent(QShowEvent *event)
validateJdk();
// Reloading SDK packages (force) is still synchronous. Use zero timer
// to let settings dialog open first.
- QTimer::singleShot(0, std::bind(&AndroidSdkManager::reloadPackages,
- &m_sdkManager, false));
+ QTimer::singleShot(0, &m_sdkManager, std::bind(&AndroidSdkManager::reloadPackages,
+ &m_sdkManager, false));
validateOpenSsl();
m_isInitialReloadDone = true;
}
@@ -308,12 +308,14 @@ void AndroidSettingsWidget::showEvent(QShowEvent *event)
void AndroidSettingsWidget::updateNdkList()
{
m_ui.ndkListWidget->clear();
- for (const Ndk *ndk : m_sdkManager.installedNdkPackages()) {
+ const auto installedPkgs = m_sdkManager.installedNdkPackages();
+ for (const Ndk *ndk : installedPkgs) {
m_ui.ndkListWidget->addItem(new QListWidgetItem(Icons::LOCKED.icon(),
ndk->installedLocation().toString()));
}
- for (const QString &ndk : m_androidConfig.getCustomNdkList()) {
+ const auto customNdks = m_androidConfig.getCustomNdkList();
+ for (const QString &ndk : customNdks) {
if (m_androidConfig.isValidNdk(ndk)) {
m_ui.ndkListWidget->addItem(new QListWidgetItem(Icons::UNLOCKED.icon(), ndk));
} else {
@@ -730,6 +732,7 @@ void AndroidSettingsWidget::downloadOpenSslRepo(const bool silent)
connect(gitCloner,
QOverload<int, QtcProcess::ExitStatus>::of(&QtcProcess::finished),
+ m_ui.openSslPathChooser,
[=](int exitCode, QProcess::ExitStatus exitStatus) {
openSslProgressDialog->close();
validateOpenSsl();