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

Android: remove unnecessary validateNDK function and ticks

Browse Source 
The NDK is installed via sdkmanager anyways, and custom NDK paths are
verified upon choosing in the file dialog and rejected if not valid.

Change-Id: I18f876dfacdbc1045679c6b082a500527a933673
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Assam Boudjelthia
2020-06-30 12:21:38 +03:00
parent 518e7970bf
commit 097c9ed484
1 changed files with 2 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,7 +105,6 @@ private:
void showEvent(QShowEvent *event) override; void showEvent(QShowEvent *event) override;
void validateJdk(); void validateJdk();
void validateNdk();
void updateNdkList(); void updateNdkList();
void onSdkPathChanged(); void onSdkPathChanged();
void validateSdk(); void validateSdk();
@@ -164,9 +163,6 @@ enum AndroidValidation {
SdkManagerSuccessfulRow, SdkManagerSuccessfulRow,
PlatformSdkInstalledRow, PlatformSdkInstalledRow,
AllEssentialsInstalledRow, AllEssentialsInstalledRow,
NdkPathExistsRow,
NdkDirStructureRow,
NdkinstallDirOkRow
}; };
enum OpenSslValidation { enum OpenSslValidation {
@@ -384,10 +380,6 @@ AndroidSettingsWidget::AndroidSettingsWidget()
"All essential packages installed for all installed Qt versions."); "All essential packages installed for all installed Qt versions.");
androidValidationPoints[BuildToolsInstalledRow] = tr("Build tools installed."); androidValidationPoints[BuildToolsInstalledRow] = tr("Build tools installed.");
androidValidationPoints[PlatformSdkInstalledRow] = tr("Platform SDK installed."); androidValidationPoints[PlatformSdkInstalledRow] = tr("Platform SDK installed.");
androidValidationPoints[NdkPathExistsRow] = tr("Default Android NDK path exists.");
androidValidationPoints[NdkDirStructureRow] = tr("Default Android NDK directory structure is correct.");
androidValidationPoints[NdkinstallDirOkRow] = tr("Default Android NDK installed into a path without "
"spaces.");
m_androidSummary = new SummaryWidget(androidValidationPoints, tr("Android settings are OK."), m_androidSummary = new SummaryWidget(androidValidationPoints, tr("Android settings are OK."),
tr("Android settings have errors."), tr("Android settings have errors."),
m_ui.androidDetailsWidget); m_ui.androidDetailsWidget);
@@ -446,7 +438,7 @@ AndroidSettingsWidget::AndroidSettingsWidget()
this, &AndroidSettingsWidget::onSdkPathChanged); this, &AndroidSettingsWidget::onSdkPathChanged);
connect(m_ui.ndkListWidget, &QListWidget::currentTextChanged, [this](const QString &ndk) { connect(m_ui.ndkListWidget, &QListWidget::currentTextChanged, [this](const QString &ndk) {
validateNdk(); updateUI();
m_ui.removeCustomNdkButton->setEnabled(m_androidConfig.getCustomNdkList().contains(ndk)); m_ui.removeCustomNdkButton->setEnabled(m_androidConfig.getCustomNdkList().contains(ndk));
}); });
connect(m_ui.addCustomNdkButton, &QPushButton::clicked, this, connect(m_ui.addCustomNdkButton, &QPushButton::clicked, this,
@@ -577,26 +569,6 @@ void AndroidSettingsWidget::validateOpenSsl()
updateUI(); updateUI();
} }
void AndroidSettingsWidget::validateNdk()
{
const QListWidgetItem *currentItem = m_ui.ndkListWidget->currentItem();
const FilePath ndkPath = FilePath::fromString(currentItem ? currentItem->text() : "");
m_androidSummary->setPointValid(NdkPathExistsRow, ndkPath.exists());
const FilePath ndkPlatformsDir = ndkPath.pathAppended("platforms");
const FilePath ndkToolChainsDir = ndkPath.pathAppended("toolchains");
const FilePath ndkSourcesDir = ndkPath.pathAppended("sources/cxx-stl");
m_androidSummary->setPointValid(NdkDirStructureRow,
ndkPlatformsDir.exists()
&& ndkToolChainsDir.exists()
&& ndkSourcesDir.exists());
m_androidSummary->setPointValid(NdkinstallDirOkRow,
ndkPlatformsDir.exists()
&& !ndkPlatformsDir.toString().contains(' '));
updateUI();
}
void AndroidSettingsWidget::onSdkPathChanged() void AndroidSettingsWidget::onSdkPathChanged()
{ {
auto sdkPath = FilePath::fromUserInput(m_ui.SDKLocationPathChooser->rawPath()); auto sdkPath = FilePath::fromUserInput(m_ui.SDKLocationPathChooser->rawPath());
@@ -628,7 +600,6 @@ void AndroidSettingsWidget::validateSdk()
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());
updateUI();
const bool sdkToolsOk = m_androidSummary->rowsOk({SdkPathExistsRow, const bool sdkToolsOk = m_androidSummary->rowsOk({SdkPathExistsRow,
SdkPathWritableRow, SdkPathWritableRow,
@@ -653,7 +624,7 @@ void AndroidSettingsWidget::validateSdk()
startUpdateAvd(); startUpdateAvd();
updateNdkList(); updateNdkList();
validateNdk(); updateUI();
} }
void AndroidSettingsWidget::openSDKDownloadUrl() void AndroidSettingsWidget::openSDKDownloadUrl()