diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2021-10-06 14:55:47 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2021-10-13 13:56:11 +0000 |
| commit | 38b97b404a7ed594d36103b5ea0783cf9c375c16 (patch) | |
| tree | 0d8f8f6d2aba74c00afa5d26e4728eef479c2be7 /src/plugins/android | |
| parent | ea8400a9ffd365300fbbb25abec8f71e9c6a016a (diff) | |
Fix various compiler warnings
Change-Id: I59db57e8501bbd0d0293ccce1b520df8acc07413
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/android')
| -rw-r--r-- | src/plugins/android/androiddevice.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/android/androidsdkmanagerwidget.cpp | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp index bba148dda86..04d2e43281e 100644 --- a/src/plugins/android/androiddevice.cpp +++ b/src/plugins/android/androiddevice.cpp @@ -151,7 +151,7 @@ AndroidDevice::AndroidDevice() setOsType(Utils::OsTypeOtherUnix); setDeviceState(DeviceConnected); - addDeviceAction({tr("Refresh"), [](const IDevice::Ptr &device, QWidget *parent) { + addDeviceAction({tr("Refresh"), [](const IDevice::Ptr &, QWidget *) { AndroidDeviceManager::instance()->updateDevicesListOnce(); }}); @@ -614,8 +614,8 @@ AndroidDeviceManager *AndroidDeviceManager::instance() AndroidDeviceManager::AndroidDeviceManager(QObject *parent) : QObject(parent), - m_androidConfig(AndroidConfigurations::currentConfig()), - m_avdManager(m_androidConfig) + m_avdManager(m_androidConfig), + m_androidConfig(AndroidConfigurations::currentConfig()) { connect(qApp, &QCoreApplication::aboutToQuit, this, [this]() { m_devicesUpdaterTimer.stop(); diff --git a/src/plugins/android/androidsdkmanagerwidget.cpp b/src/plugins/android/androidsdkmanagerwidget.cpp index c576571d32c..53a887e23d9 100644 --- a/src/plugins/android/androidsdkmanagerwidget.cpp +++ b/src/plugins/android/androidsdkmanagerwidget.cpp @@ -133,7 +133,6 @@ AndroidSdkManagerWidget::AndroidSdkManagerWidget(AndroidConfig &config, m_ui->searchField->setPlaceholderText("Filter"); connect(m_ui->searchField, &QLineEdit::textChanged, [this, proxyModel](const QString &text) { - const bool isExpanded = m_ui->expandCheck->isChecked(); proxyModel->setAcceptedSearchPackage(text); m_sdkModel->resetSelection(); // It is more convenient to expand the view with the results @@ -513,7 +512,7 @@ bool PackageFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sour } } - return showTopLevel || (packageState(srcIndex) & m_packageState) && packageFound(srcIndex); + return showTopLevel || ((packageState(srcIndex) & m_packageState) && packageFound(srcIndex)); } OptionsDialog::OptionsDialog(AndroidSdkManager *sdkManager, const QStringList &args, |