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

Merge remote-tracking branch 'origin/4.12'

Browse Source 
Change-Id: Ie35e9959693b6f6f78509eea5b259d6493ef87f2
This commit is contained in:
Eike Ziller
2020-04-17 08:09:55 +02:00
parent 2795292c74 e85c074621
commit 602d690bab
55 changed files with 7620 additions and 5291 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()))
continue;
if ((*tool)->type() == AndroidSdkPackage::PlatformToolsPackage)
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
addTool(tool);
pendingPkgs.removeOne((*tool)->sdkStylePath());
if (pendingPkgs.isEmpty())
break;
}

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

@@ -820,7 +820,7 @@ void AndroidSettingsWidget::downloadOpenSslRepo(const bool silent)
const QString openSslRepo("https://github.com/KDAB/android_openssl.git");
Utils::QtcProcess *gitCloner = new Utils::QtcProcess(this);
gitCloner->setCommand(Utils::CommandLine("git", {"clone", openSslRepo, openSslPath.fileName()}));
gitCloner->setCommand(Utils::CommandLine("git", {"clone", "--depth=1", openSslRepo, openSslPath.fileName()}));
gitCloner->setWorkingDirectory(openSslPath.parentDir().toString());
QDir openSslDir(openSslPath.toString());