aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/android/androidsdkmanager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/android/androidsdkmanager.cpp')
-rw-r--r--src/plugins/android/androidsdkmanager.cpp24
1 files changed, 10 insertions, 14 deletions
diff --git a/src/plugins/android/androidsdkmanager.cpp b/src/plugins/android/androidsdkmanager.cpp
index f6d46acd833..1de5fc0c8ad 100644
--- a/src/plugins/android/androidsdkmanager.cpp
+++ b/src/plugins/android/androidsdkmanager.cpp
@@ -162,13 +162,12 @@ public:
AndroidSdkPackageList filteredPackages(AndroidSdkPackage::PackageState state,
AndroidSdkPackage::PackageType type)
{
- refreshSdkPackages();
+ m_sdkManager.refreshPackages();
return Utils::filtered(m_allPackages, [state, type](const AndroidSdkPackage *p) {
return p->state() & state && p->type() & type;
});
}
const AndroidSdkPackageList &allPackages();
- void refreshSdkPackages(bool forceReload = false);
void parseCommonArguments(QPromise<QString> &promise);
void updateInstalled(SdkCmdPromise &fi);
@@ -182,7 +181,6 @@ public:
std::unique_ptr<QFutureWatcher<void>, decltype(&watcherDeleter)> m_activeOperation;
-private:
QByteArray getUserInput() const;
void clearUserInput();
void reloadSdkPackages();
@@ -289,9 +287,15 @@ BuildToolsList AndroidSdkManager::filteredBuildTools(int minApiLevel,
return result;
}
-void AndroidSdkManager::reloadPackages(bool forceReload)
+void AndroidSdkManager::refreshPackages()
{
- m_d->refreshSdkPackages(forceReload);
+ if (androidConfig().sdkManagerToolPath() != m_d->lastSdkManagerPath)
+ reloadPackages();
+}
+
+void AndroidSdkManager::reloadPackages()
+{
+ m_d->reloadSdkPackages();
}
bool AndroidSdkManager::isBusy() const
@@ -370,7 +374,7 @@ AndroidSdkManagerPrivate::~AndroidSdkManagerPrivate()
const AndroidSdkPackageList &AndroidSdkManagerPrivate::allPackages()
{
- refreshSdkPackages();
+ m_sdkManager.refreshPackages();
return m_allPackages;
}
@@ -402,14 +406,6 @@ void AndroidSdkManagerPrivate::reloadSdkPackages()
emit m_sdkManager.packageReloadFinished();
}
-void AndroidSdkManagerPrivate::refreshSdkPackages(bool forceReload)
-{
- // Sdk path changed. Updated packages.
- // QTC updates the package listing only
- if (androidConfig().sdkManagerToolPath() != lastSdkManagerPath || forceReload)
- reloadSdkPackages();
-}
-
void AndroidSdkManagerPrivate::updateInstalled(SdkCmdPromise &promise)
{
promise.setProgressRange(0, 100);