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

Android: simplify AndroidSdkManagerWidget::installEssentials()

Browse Source 
Remove an argument that doesn't need to be be provided explicitly
by the caller and can be done internally.

Change-Id: Ie225f847560b746ce9b8103ab38caca5caca1b0a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Assam Boudjelthia
2022-03-26 19:06:17 +02:00
parent d7fd254a79
commit 525a284f3e
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/android/androidsdkmanagerwidget.cpp
View File

@@ -206,7 +206,7 @@ AndroidSdkManagerWidget::~AndroidSdkManagerWidget()
delete m_ui;
}
void AndroidSdkManagerWidget::installEssentials(const QString &extraMessage)
void AndroidSdkManagerWidget::installEssentials()
{
m_sdkModel->selectMissingEssentials();
if (!m_sdkModel->missingEssentials().isEmpty()) {
@@ -217,7 +217,8 @@ void AndroidSdkManagerWidget::installEssentials(const QString &extraMessage)
.arg(Core::Constants::IDE_DISPLAY_NAME)
.arg(m_sdkModel->missingEssentials().join("\", \"")));
}
onApplyButton(extraMessage);
onApplyButton(tr("Android SDK installation is missing necessary packages. "
"Do you want to install the missing packages?"));
}
void AndroidSdkManagerWidget::beginLicenseCheck()

2
src/plugins/android/androidsdkmanagerwidget.h
View File

@@ -80,7 +80,7 @@ public:
QWidget *parent = nullptr);
~AndroidSdkManagerWidget() override;
void installEssentials(const QString &extraMessage = {});
void installEssentials();
signals:
void updatingSdk();

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

@@ -515,11 +515,8 @@ void AndroidSettingsWidget::validateSdk()
PlatformSdkInstalledRow,
AllEssentialsInstalledRow});
m_androidConfig.setSdkFullyConfigured(sdkToolsOk && componentsOk);
if (sdkToolsOk && !componentsOk) {
m_sdkManagerWidget->installEssentials(
"Android SDK installation is missing necessary packages. "
"Do you want to install the missing packages?");
}
if (sdkToolsOk && !componentsOk)
m_sdkManagerWidget->installEssentials();
updateNdkList();
updateUI();