forked from qt-creator/qt-creator
QMakeStep: Simplify recipe
Use conditional expression with nullItem. Change-Id: I38e14fceef1a7e3e72c6b3598831241966062bb5 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
@@ -298,13 +298,12 @@ Tasking::GroupItem QMakeStep::runRecipe()
|
||||
m_needToRunQMake = false;
|
||||
};
|
||||
|
||||
QList<GroupItem> processList = {onGroupSetup(onSetup),
|
||||
onGroupDone(onDone, CallDoneIf::Success),
|
||||
ProcessTask(onQMakeSetup, onProcessDone)};
|
||||
if (m_runMakeQmake)
|
||||
processList << ProcessTask(onMakeQMakeSetup, onProcessDone);
|
||||
|
||||
return Group(processList);
|
||||
return Group {
|
||||
onGroupSetup(onSetup),
|
||||
ProcessTask(onQMakeSetup, onProcessDone),
|
||||
m_runMakeQmake ? ProcessTask(onMakeQMakeSetup, onProcessDone) : nullItem,
|
||||
onGroupDone(onDone, CallDoneIf::Success)
|
||||
};
|
||||
}
|
||||
|
||||
void QMakeStep::setForced(bool b)
|
||||
|
||||
Reference in New Issue
Block a user