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

Android: Get rid of missingEssentials field

Browse Source 
Change-Id: I8e89266ed8e0ad56f00bb3ad769314d48084cd6d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Jarek Kobus
2024-04-18 10:47:24 +02:00
parent 251fcdf38a
commit e012488ac8
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -275,14 +275,14 @@ AndroidSdkManagerWidget::~AndroidSdkManagerWidget()
void AndroidSdkManagerWidget::installEssentials() void AndroidSdkManagerWidget::installEssentials()
{ {
m_sdkModel->selectMissingEssentials(); const QStringList missingEssentials = m_sdkModel->selectMissingEssentials();
if (!m_sdkModel->missingEssentials().isEmpty()) { if (!missingEssentials.isEmpty()) {
QMessageBox::warning(Core::ICore::dialogParent(), QMessageBox::warning(Core::ICore::dialogParent(),
Tr::tr("Android SDK Changes"), Tr::tr("Android SDK Changes"),
Tr::tr("%1 cannot find the following essential packages: \"%2\".\n" Tr::tr("%1 cannot find the following essential packages: \"%2\".\n"
"Install them manually after the current operation is done.\n") "Install them manually after the current operation is done.\n")
.arg(QGuiApplication::applicationDisplayName(), .arg(QGuiApplication::applicationDisplayName(),
m_sdkModel->missingEssentials().join("\", \""))); missingEssentials.join("\", \"")));
} }
onApplyButton(Tr::tr("Android SDK installation is missing necessary packages. " onApplyButton(Tr::tr("Android SDK installation is missing necessary packages. "
"Do you want to install the missing packages?")); "Do you want to install the missing packages?"));

8
src/plugins/android/androidsdkmodel.cpp
View File

@@ -258,7 +258,7 @@ bool AndroidSdkModel::setData(const QModelIndex &index, const QVariant &value, i
return false; return false;
} }
void AndroidSdkModel::selectMissingEssentials() QStringList AndroidSdkModel::selectMissingEssentials()
{ {
resetSelection(); resetSelection();
QStringList pendingPkgs(androidConfig().allEssentials()); QStringList pendingPkgs(androidConfig().allEssentials());
@@ -295,9 +295,9 @@ void AndroidSdkModel::selectMissingEssentials()
break; break;
} }
m_missingEssentials = pendingPkgs; if (!pendingPkgs.isEmpty())
if (!m_missingEssentials.isEmpty()) qCDebug(androidSdkModelLog) << "Couldn't find some essential packages:" << pendingPkgs;
qCDebug(androidSdkModelLog) << "Couldn't find some essential packages:" << m_missingEssentials; return pendingPkgs;
} }
QList<const AndroidSdkPackage *> AndroidSdkModel::userSelection() const QList<const AndroidSdkPackage *> AndroidSdkModel::userSelection() const

5
src/plugins/android/androidsdkmodel.h
View File

@@ -41,12 +41,10 @@ public:
Qt::ItemFlags flags(const QModelIndex &index) const override; Qt::ItemFlags flags(const QModelIndex &index) const override;
bool setData(const QModelIndex &index, const QVariant &value, int role) override; bool setData(const QModelIndex &index, const QVariant &value, int role) override;
void selectMissingEssentials(); QStringList selectMissingEssentials();
QList<const AndroidSdkPackage *> userSelection() const; QList<const AndroidSdkPackage *> userSelection() const;
void resetSelection(); void resetSelection();
QStringList missingEssentials() const { return m_missingEssentials; }
private: private:
void clearContainers(); void clearContainers();
void refreshData(); void refreshData();
@@ -55,7 +53,6 @@ private:
QList<const SdkPlatform *> m_sdkPlatforms; QList<const SdkPlatform *> m_sdkPlatforms;
QList<const AndroidSdkPackage *> m_tools; QList<const AndroidSdkPackage *> m_tools;
QSet<const AndroidSdkPackage *> m_changeState; QSet<const AndroidSdkPackage *> m_changeState;
QStringList m_missingEssentials;
}; };
} // namespace Internal } // namespace Internal