diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/android/androidsdkmanagerwidget.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/android/androidsdkmodel.cpp | 8 | ||||
| -rw-r--r-- | src/plugins/android/androidsdkmodel.h | 5 |
3 files changed, 8 insertions, 11 deletions
diff --git a/src/plugins/android/androidsdkmanagerwidget.cpp b/src/plugins/android/androidsdkmanagerwidget.cpp index 2c41ab8c60..6eebe0adb4 100644 --- a/src/plugins/android/androidsdkmanagerwidget.cpp +++ b/src/plugins/android/androidsdkmanagerwidget.cpp @@ -275,14 +275,14 @@ AndroidSdkManagerWidget::~AndroidSdkManagerWidget() void AndroidSdkManagerWidget::installEssentials() { - m_sdkModel->selectMissingEssentials(); - if (!m_sdkModel->missingEssentials().isEmpty()) { + const QStringList missingEssentials = m_sdkModel->selectMissingEssentials(); + if (!missingEssentials.isEmpty()) { QMessageBox::warning(Core::ICore::dialogParent(), Tr::tr("Android SDK Changes"), Tr::tr("%1 cannot find the following essential packages: \"%2\".\n" "Install them manually after the current operation is done.\n") .arg(QGuiApplication::applicationDisplayName(), - m_sdkModel->missingEssentials().join("\", \""))); + missingEssentials.join("\", \""))); } onApplyButton(Tr::tr("Android SDK installation is missing necessary packages. " "Do you want to install the missing packages?")); diff --git a/src/plugins/android/androidsdkmodel.cpp b/src/plugins/android/androidsdkmodel.cpp index 9643b3a20a..6fc2b02759 100644 --- a/src/plugins/android/androidsdkmodel.cpp +++ b/src/plugins/android/androidsdkmodel.cpp @@ -258,7 +258,7 @@ bool AndroidSdkModel::setData(const QModelIndex &index, const QVariant &value, i return false; } -void AndroidSdkModel::selectMissingEssentials() +QStringList AndroidSdkModel::selectMissingEssentials() { resetSelection(); QStringList pendingPkgs(androidConfig().allEssentials()); @@ -295,9 +295,9 @@ void AndroidSdkModel::selectMissingEssentials() break; } - m_missingEssentials = pendingPkgs; - if (!m_missingEssentials.isEmpty()) - qCDebug(androidSdkModelLog) << "Couldn't find some essential packages:" << m_missingEssentials; + if (!pendingPkgs.isEmpty()) + qCDebug(androidSdkModelLog) << "Couldn't find some essential packages:" << pendingPkgs; + return pendingPkgs; } QList<const AndroidSdkPackage *> AndroidSdkModel::userSelection() const diff --git a/src/plugins/android/androidsdkmodel.h b/src/plugins/android/androidsdkmodel.h index 2033f5fa9b..b80ef897f7 100644 --- a/src/plugins/android/androidsdkmodel.h +++ b/src/plugins/android/androidsdkmodel.h @@ -41,12 +41,10 @@ public: Qt::ItemFlags flags(const QModelIndex &index) const override; bool setData(const QModelIndex &index, const QVariant &value, int role) override; - void selectMissingEssentials(); + QStringList selectMissingEssentials(); QList<const AndroidSdkPackage *> userSelection() const; void resetSelection(); - QStringList missingEssentials() const { return m_missingEssentials; } - private: void clearContainers(); void refreshData(); @@ -55,7 +53,6 @@ private: QList<const SdkPlatform *> m_sdkPlatforms; QList<const AndroidSdkPackage *> m_tools; QSet<const AndroidSdkPackage *> m_changeState; - QStringList m_missingEssentials; }; } // namespace Internal |