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

Android: validate jdk path at start and reload sdkmanager after that

Browse Source 
* Validate Jdk path at the start to avoid showing valide settings on
empty path.
* Reload sdkmanager after jdk path is changed to reflect changes.

Change-Id: Ib5eafead9d4f695cf79c55b79866bd3269dadbd5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Assam Boudjelthia
2020-06-26 00:34:51 +03:00
parent 004bef4909
commit 5c5c505910
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -319,6 +319,7 @@ void AndroidSettingsWidget::showEvent(QShowEvent *event)
{ {
Q_UNUSED(event) Q_UNUSED(event)
if (!m_isInitialReloadDone) { if (!m_isInitialReloadDone) {
validateJdk();
// Reloading SDK packages (force) is still synchronous. Use zero timer // Reloading SDK packages (force) is still synchronous. Use zero timer
// to let settings dialog open first. // to let settings dialog open first.
QTimer::singleShot(0, std::bind(&AndroidSdkManager::reloadPackages, QTimer::singleShot(0, std::bind(&AndroidSdkManager::reloadPackages,
@@ -582,6 +583,9 @@ void AndroidSettingsWidget::validateJdk()
m_javaSummary->setPointValid(JavaJdkValidRow, jdkPathExists && bin.exists()); m_javaSummary->setPointValid(JavaJdkValidRow, jdkPathExists && bin.exists());
updateUI(); updateUI();
if (m_isInitialReloadDone)
m_sdkManager.reloadPackages(true);
} }
void AndroidSettingsWidget::validateOpenSsl() void AndroidSettingsWidget::validateOpenSsl()