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

Android: warn about essential packages not found

Browse Source 
Task-number: QTCREATORBUG-23829
Change-Id: Ic3ebd606bfde48b0f7152869a437f2f711ce1d03
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Assam Boudjelthia
2020-05-18 18:03:50 +03:00
parent a2273f9f82
commit 9ee24391e6
3 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,11 @@
#include <utils/utilsicons.h>
#include <QIcon>
#include <QLoggingCategory>
namespace {
static Q_LOGGING_CATEGORY(androidSdkModelLog, "qtc.android.sdkmodel", QtWarningMsg)
}
namespace Android {
namespace Internal {
@@ -294,7 +299,9 @@ void AndroidSdkModel::selectMissingEssentials()
// Select SDK platform
for (const SdkPlatform *platform : m_sdkPlatforms) {
if (pendingPkgs.contains(platform->sdkStylePath()) &&
if (!platform->installedLocation().isEmpty()) {
pendingPkgs.removeOne(platform->sdkStylePath());
} else if (pendingPkgs.contains(platform->sdkStylePath()) &&
platform->installedLocation().isEmpty()) {
auto i = index(0, 0, index(1, 0));
m_changeState << platform;
@@ -304,6 +311,9 @@ void AndroidSdkModel::selectMissingEssentials()
if (pendingPkgs.isEmpty())
break;
}
m_missingEssentials = pendingPkgs;
qCDebug(androidSdkModelLog) << "Couldn't find some essential packages:" << m_missingEssentials;
}
QList<const AndroidSdkPackage *> AndroidSdkModel::userSelection() const