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

Android: Make installationRecipe return Error on at least one error

Browse Source 
Task-number: QTCREATORBUG-31812
Change-Id: I865e608e11b2d78cc4cad918fcbf6cd1353a9a2c
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Jarek Kobus
2024-10-24 10:59:45 +02:00
parent f24cc172ce
commit 125d443606
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -293,21 +293,23 @@ static GroupItem installationRecipe(const Storage<DialogStorage> &dialogStorage,
}; };
return Group { return Group {
continueOnError,
onGroupSetup(onSetup), onGroupSetup(onSetup),
For (uninstallIterator) >> Do { For (uninstallIterator) >> Do {
finishAllAndSuccess, continueOnError,
ProcessTask(onUninstallSetup, onDone) ProcessTask(onUninstallSetup, onDone)
}, },
For (installIterator) >> Do { For (installIterator) >> Do {
finishAllAndSuccess, continueOnError,
ProcessTask(onInstallSetup, onDone) ProcessTask(onInstallSetup, onDone)
} },
onGroupDone([dialogStorage] { dialogStorage->m_dialog->setProgress(100); })
}; };
} }
static GroupItem updateRecipe(const Storage<DialogStorage> &dialogStorage) static GroupItem updateRecipe(const Storage<DialogStorage> &dialogStorage)
{ {
const auto onUpdateSetup = [dialogStorage](Process &process) { const auto onSetup = [dialogStorage](Process &process) {
const QStringList args = {"--update", sdkRootArg()}; const QStringList args = {"--update", sdkRootArg()};
QuestionProgressDialog *dialog = dialogStorage->m_dialog.get(); QuestionProgressDialog *dialog = dialogStorage->m_dialog.get();
setupSdkProcess(args, &process, dialog, 0, 1); setupSdkProcess(args, &process, dialog, 0, 1);
@@ -318,7 +320,7 @@ static GroupItem updateRecipe(const Storage<DialogStorage> &dialogStorage)
handleSdkProcess(dialogStorage->m_dialog.get(), result); handleSdkProcess(dialogStorage->m_dialog.get(), result);
}; };
return ProcessTask(onUpdateSetup, onDone); return ProcessTask(onSetup, onDone);
} }
class AndroidSdkManagerPrivate class AndroidSdkManagerPrivate