From 56b88ab7580d0db10adb36e5972e83e13ea3f2c2 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 28 Oct 2024 12:51:20 +0100 Subject: [PATCH] Android: Fix filling Target combobox inside New AVD dialog Remove local instance of AndroidSdkManager from AvdDialog and use the global one instead. Call explicitly refreshPackages on Dialog creation. Amends ca8e5dbb4ee1f9f66d9dd0a2d24472a46d6bda5d Change-Id: I63d3917cb656bcc9b536e49915cf98cbb543358c Reviewed-by: Assam Boudjelthia --- src/plugins/android/avddialog.cpp | 4 +++- src/plugins/android/avddialog.h | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/android/avddialog.cpp b/src/plugins/android/avddialog.cpp index 650ce413d8e..f02abcde29b 100644 --- a/src/plugins/android/avddialog.cpp +++ b/src/plugins/android/avddialog.cpp @@ -42,6 +42,7 @@ AvdDialog::AvdDialog(QWidget *parent) : QDialog(parent) , m_allowedNameChars(QLatin1String("[a-z|A-Z|0-9|._-]*")) { + AndroidConfigurations::sdkManager()->refreshPackages(); resize(800, 0); setWindowTitle(Tr::tr("Create new AVD")); @@ -302,7 +303,8 @@ int AvdDialog::sdcardSize() const void AvdDialog::updateApiLevelComboBox() { - SystemImageList installedSystemImages = m_sdkManager.installedSystemImages(); + const SystemImageList installedSystemImages + = AndroidConfigurations::sdkManager()->installedSystemImages(); DeviceType curDeviceType = m_deviceTypeToStringMap.key( m_deviceDefinitionTypeComboBox->currentText()); diff --git a/src/plugins/android/avddialog.h b/src/plugins/android/avddialog.h index d0e349f780e..550a04a158e 100644 --- a/src/plugins/android/avddialog.h +++ b/src/plugins/android/avddialog.h @@ -61,7 +61,6 @@ private: QTimer m_hideTipTimer; QRegularExpression m_allowedNameChars; QList m_deviceDefinitionsList; - AndroidSdkManager m_sdkManager; QMap m_deviceTypeToStringMap; QComboBox *m_abiComboBox;