diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-07-01 23:42:34 +0300 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-07-03 08:14:14 +0000 |
| commit | e3e0dd6c4d10fc60fbaa5264c596457bc5b91abf (patch) | |
| tree | a250c11b57329f9b0d9ff9068c02be7c59287897 /src/plugins/android | |
| parent | 7f436e23acbed756e53801a011fe2c98705c6ecf (diff) | |
Android: pass sdkMaanger to allEssentialsInstalled() to keep sync
Change-Id: Ibe8385140c0d64394941b215324b70138d6f0cdf
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'src/plugins/android')
| -rw-r--r-- | src/plugins/android/androidconfigurations.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/android/androidconfigurations.h | 4 | ||||
| -rw-r--r-- | src/plugins/android/androidsettingswidget.cpp | 3 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 00cd6fabf5..423fd3794f 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -30,7 +30,6 @@ #include "androidmanager.h" #include "androidqtversion.h" #include "androiddevicedialog.h" -#include "androidsdkmanager.h" #include "avddialog.h" #include <coreplugin/icore.h> @@ -964,11 +963,10 @@ QStringList AndroidConfig::allEssentials() const return allPackages; } -bool AndroidConfig::allEssentialsInstalled() +bool AndroidConfig::allEssentialsInstalled(AndroidSdkManager *sdkManager) { QStringList essentialPkgs(allEssentials()); - for (const AndroidSdkPackage *pkg : - AndroidConfigurations::sdkManager()->installedSdkPackages()) { + for (const AndroidSdkPackage *pkg : sdkManager->installedSdkPackages()) { if (essentialPkgs.contains(pkg->sdkStylePath())) essentialPkgs.removeOne(pkg->sdkStylePath()); if (essentialPkgs.isEmpty()) diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h index 24e26309a0..a727b3690c 100644 --- a/src/plugins/android/androidconfigurations.h +++ b/src/plugins/android/androidconfigurations.h @@ -27,6 +27,8 @@ #include "android_global.h" #include "androidsdkpackage.h" +#include "androidsdkmanager.h" + #include <projectexplorer/toolchain.h> #include <qtsupport/qtversionmanager.h> @@ -134,7 +136,7 @@ public: QStringList defaultEssentials() const; QStringList essentialsFromQtVersion(const QtSupport::BaseQtVersion &version) const; QStringList allEssentials() const; - bool allEssentialsInstalled(); + bool allEssentialsInstalled(Internal::AndroidSdkManager *sdkManager); bool sdkToolsOk() const; Utils::FilePath openJDKLocation() const; diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index af7e949248..efa32e1b1f 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -606,7 +606,8 @@ void AndroidSettingsWidget::validateSdk() // after AndroidSdkManager::packageReloadFinished. m_androidSummary->setPointValid(PlatformSdkInstalledRow, !m_sdkManager.installedSdkPlatforms().isEmpty()); - m_androidSummary->setPointValid(AllEssentialsInstalledRow, m_androidConfig.allEssentialsInstalled()); + m_androidSummary->setPointValid(AllEssentialsInstalledRow, + m_androidConfig.allEssentialsInstalled(&m_sdkManager)); const bool sdkToolsOk = m_androidSummary->rowsOk({SdkPathExistsRow, SdkPathWritableRow, |