feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: pass sdkMaanger to allEssentialsInstalled() to keep sync

Browse Source 
Change-Id: Ibe8385140c0d64394941b215324b70138d6f0cdf
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Assam Boudjelthia
2020-07-01 23:42:34 +03:00
parent 7f436e23ac
commit e3e0dd6c4d
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/android/androidconfigurations.cpp
View File

@@ -30,7 +30,6 @@
#include "androidmanager.h" #include "androidmanager.h"
#include "androidqtversion.h" #include "androidqtversion.h"
#include "androiddevicedialog.h" #include "androiddevicedialog.h"
#include "androidsdkmanager.h"
#include "avddialog.h" #include "avddialog.h"
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
@@ -964,11 +963,10 @@ QStringList AndroidConfig::allEssentials() const
return allPackages; return allPackages;
} }
bool AndroidConfig::allEssentialsInstalled() bool AndroidConfig::allEssentialsInstalled(AndroidSdkManager *sdkManager)
{ {
QStringList essentialPkgs(allEssentials()); QStringList essentialPkgs(allEssentials());
for (const AndroidSdkPackage *pkg : for (const AndroidSdkPackage *pkg : sdkManager->installedSdkPackages()) {
AndroidConfigurations::sdkManager()->installedSdkPackages()) {
if (essentialPkgs.contains(pkg->sdkStylePath())) if (essentialPkgs.contains(pkg->sdkStylePath()))
essentialPkgs.removeOne(pkg->sdkStylePath()); essentialPkgs.removeOne(pkg->sdkStylePath());
if (essentialPkgs.isEmpty()) if (essentialPkgs.isEmpty())

4
src/plugins/android/androidconfigurations.h
View File

@@ -27,6 +27,8 @@
#include "android_global.h" #include "android_global.h"
#include "androidsdkpackage.h" #include "androidsdkpackage.h"
#include "androidsdkmanager.h"
#include <projectexplorer/toolchain.h> #include <projectexplorer/toolchain.h>
#include <qtsupport/qtversionmanager.h> #include <qtsupport/qtversionmanager.h>
@@ -134,7 +136,7 @@ public:
QStringList defaultEssentials() const; QStringList defaultEssentials() const;
QStringList essentialsFromQtVersion(const QtSupport::BaseQtVersion &version) const; QStringList essentialsFromQtVersion(const QtSupport::BaseQtVersion &version) const;
QStringList allEssentials() const; QStringList allEssentials() const;
bool allEssentialsInstalled(); bool allEssentialsInstalled(Internal::AndroidSdkManager *sdkManager);
bool sdkToolsOk() const; bool sdkToolsOk() const;
Utils::FilePath openJDKLocation() const; Utils::FilePath openJDKLocation() const;

3
src/plugins/android/androidsettingswidget.cpp
View File

@@ -606,7 +606,8 @@ void AndroidSettingsWidget::validateSdk()
// after AndroidSdkManager::packageReloadFinished. // after AndroidSdkManager::packageReloadFinished.
m_androidSummary->setPointValid(PlatformSdkInstalledRow, m_androidSummary->setPointValid(PlatformSdkInstalledRow,
!m_sdkManager.installedSdkPlatforms().isEmpty()); !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, const bool sdkToolsOk = m_androidSummary->rowsOk({SdkPathExistsRow,
SdkPathWritableRow, SdkPathWritableRow,