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

Android: fix sdkmanager not picking up all marked essential packages

Browse Source 
Task-number: QTCREATORBUG-23829
Change-Id: Id436c96a8b9376d10ada92412c154c5aea2a294b
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Assam Boudjelthia
2020-04-14 19:48:33 +03:00
parent 2d4a2d19ae
commit 54f76d29c0
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -285,14 +285,9 @@ void AndroidSdkModel::selectMissingEssentials()
if (!pendingPkgs.contains((*tool)->sdkStylePath())) if (!pendingPkgs.contains((*tool)->sdkStylePath()))
continue; continue;
if ((*tool)->type() == AndroidSdkPackage::PlatformToolsPackage) addTool(tool);
addTool(tool); // Select Platform tools
else if ((*tool)->type() == AndroidSdkPackage::BuildToolsPackage)
addTool(tool); // Select build tools
else if ((*tool)->type() == AndroidSdkPackage::NDKPackage)
addTool(tool); // Select NDK Bundle
pendingPkgs.removeOne((*tool)->sdkStylePath()); pendingPkgs.removeOne((*tool)->sdkStylePath());
if (pendingPkgs.isEmpty()) if (pendingPkgs.isEmpty())
break; break;
} }