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

TaskTree: Prepare for OnGroup... -> onGroup... renaming

Browse Source 
Change-Id: I52b695999b53b80fb8dbb77895080f6c1b86a58f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2023-05-02 09:28:52 +02:00
parent 6f31d87444
commit ceff14303a
6 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qmakeprojectmanager/qmakestep.cpp
View File

@@ -300,13 +300,13 @@ void QMakeStep::doRun()
setupProcess(&process);
};
const auto onDone = [this](const Process &) {
const auto onProcessDone = [this](const Process &) {
const QString command = displayedParameters()->effectiveCommand().toUserOutput();
emit addOutput(Tr::tr("The process \"%1\" exited normally.").arg(command),
OutputFormat::NormalMessage);
};
const auto onError = [this](const Process &process) {
const auto onProcessError = [this](const Process &process) {
const QString command = displayedParameters()->effectiveCommand().toUserOutput();
if (process.result() == ProcessResult::FinishedWithError) {
emit addOutput(Tr::tr("The process \"%1\" exited with code %2.")
@@ -326,14 +326,14 @@ void QMakeStep::doRun()
m_needToRunQMake = true;
};
const auto onGroupDone = [this] {
const auto onDone = [this] {
emit buildConfiguration()->buildDirectoryInitialized();
};
QList<TaskItem> processList = {ProcessTask(setupQMake, onDone, onError)};
QList<TaskItem> processList = {ProcessTask(setupQMake, onProcessDone, onProcessError)};
if (m_runMakeQmake)
processList << ProcessTask(setupMakeQMake, onDone, onError);
processList << OnGroupDone(onGroupDone);
processList << ProcessTask(setupMakeQMake, onProcessDone, onProcessError);
processList << OnGroupDone(onDone);
runTaskTree(Group(processList));
}