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

Merge remote-tracking branch 'origin/11.0'

Browse Source 
Change-Id: Icb3ed8a1aaf31e8201a61d04221bfcb23a78562a
This commit is contained in:
Eike Ziller
2023-06-22 12:42:43 +02:00
parent 87861cf7ee 369cba84bb
commit 6479785c20
78 changed files with 1255 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -158,20 +158,20 @@ void AndroidSdkDownloader::downloadAndExtractSdk()
m_progressDialog->setRange(0, 0);
m_progressDialog->setLabelText(Tr::tr("Unarchiving SDK Tools package..."));
if (!*storage)
return TaskAction::StopWithError;
return SetupResult::StopWithError;
const FilePath sdkFileName = **storage;
if (!verifyFileIntegrity(sdkFileName, m_androidConfig.getSdkToolsSha256())) {
logError(Tr::tr("Verifying the integrity of the downloaded file has failed."));
return TaskAction::StopWithError;
return SetupResult::StopWithError;
}
const auto sourceAndCommand = Unarchiver::sourceAndCommand(sdkFileName);
if (!sourceAndCommand) {
logError(sourceAndCommand.error());
return TaskAction::StopWithError;
return SetupResult::StopWithError;
}
unarchiver.setSourceAndCommand(*sourceAndCommand);
unarchiver.setDestDir(sdkFileName.parentDir());
return TaskAction::Continue;
return SetupResult::Continue;
};
const auto onUnarchiverDone = [this, storage](const Unarchiver &) {
m_androidConfig.setTemporarySdkToolsPath(