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

BuildManager: Avoid code repetition in 2 "if" branches

Browse Source 
Change-Id: If3ecb5457c2f7b661bed1c8daf80bf289204da15
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2023-07-16 09:46:44 +02:00
parent d5f754d456
commit cd81336f40
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/projectexplorer/buildmanager.cpp
View File

@@ -652,13 +652,13 @@ void BuildManager::addToOutputWindow(const QString &string, BuildStep::OutputFor
void BuildManager::nextBuildQueue() void BuildManager::nextBuildQueue()
{ {
d->m_outputWindow->flush(); d->m_outputWindow->flush();
disconnectOutput(d->m_currentBuildStep);
decrementActiveBuildSteps(d->m_currentBuildStep);
if (d->m_canceling) { if (d->m_canceling) {
d->m_canceling = false; d->m_canceling = false;
QTimer::singleShot(0, m_instance, &BuildManager::emitCancelMessage); QTimer::singleShot(0, m_instance, &BuildManager::emitCancelMessage);
disconnectOutput(d->m_currentBuildStep);
decrementActiveBuildSteps(d->m_currentBuildStep);
//TODO NBS fix in qtconcurrent //TODO NBS fix in qtconcurrent
d->m_progressFutureInterface->setProgressValueAndText(d->m_progress*100, d->m_progressFutureInterface->setProgressValueAndText(d->m_progress*100,
Tr::tr("Build/Deployment canceled")); Tr::tr("Build/Deployment canceled"));
@@ -666,11 +666,9 @@ void BuildManager::nextBuildQueue()
return; return;
} }
disconnectOutput(d->m_currentBuildStep);
if (!d->m_skipDisabled) if (!d->m_skipDisabled)
++d->m_progress; ++d->m_progress;
d->m_progressFutureInterface->setProgressValueAndText(d->m_progress*100, msgProgress(d->m_progress, d->m_maxProgress)); d->m_progressFutureInterface->setProgressValueAndText(d->m_progress*100, msgProgress(d->m_progress, d->m_maxProgress));
decrementActiveBuildSteps(d->m_currentBuildStep);
const bool success = d->m_skipDisabled || d->m_lastStepSucceeded; const bool success = d->m_skipDisabled || d->m_lastStepSucceeded;
if (success) { if (success) {