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

Android: Reuse withCancel()

Browse Source 
Simplify the recipe by reusing withCancel() helper.

Change-Id: I79c583fa3f0bedc7a3c0c3cfa99f5c506f07336b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Jarek Kobus
2024-04-25 12:02:37 +02:00
parent 947ce1659b
commit 7bd8d963ab
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -204,24 +204,17 @@ GroupItem downloadSdkRecipe()
androidConfig().setTemporarySdkToolsPath( androidConfig().setTemporarySdkToolsPath(
storage->sdkFileName->parentDir().pathAppended(Constants::cmdlineToolsName)); storage->sdkFileName->parentDir().pathAppended(Constants::cmdlineToolsName));
}; };
const auto onCancelSetup = [storage] { return std::make_pair(storage->progressDialog.get(),
const auto onCanceled = [storage](Barrier &barrier) { &QProgressDialog::canceled); };
// Avoid deleting progress dialog from its signal handler.
QObject::connect(storage->progressDialog.get(), &QProgressDialog::canceled,
&barrier, &Barrier::advance, Qt::QueuedConnection);
};
return Group { return Group {
storage, storage,
parallel,
stopOnSuccessOrError,
Group { Group {
onGroupSetup(onSetup), onGroupSetup(onSetup),
NetworkQueryTask(onQuerySetup, onQueryDone), NetworkQueryTask(onQuerySetup, onQueryDone),
AsyncTask<void>(onValidationSetup, onValidationDone), AsyncTask<void>(onValidationSetup, onValidationDone),
UnarchiverTask(onUnarchiveSetup, onUnarchiverDone) UnarchiverTask(onUnarchiveSetup, onUnarchiverDone)
}, }.withCancel(onCancelSetup)
BarrierTask(onCanceled, [] { return DoneResult::Error; })
}; };
} }