From 012f926f7c28e34eadfe93f1365d63f0a11b4c80 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Sat, 15 Jul 2023 19:30:46 +0200
Subject: [PATCH] BuildManager: Move some repeating code into
 buildQueueAppend()

Make it clear that calling init() on newly added build steps
are always followed synchronously by starting a build queue.

Change-Id: I9918b2e595cdb1d0639490e3edf77e67fb8ae52e
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
---
 src/plugins/projectexplorer/buildmanager.cpp | 25 +++++++-------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp
index 7634d69bea5..d33e2fa3e4b 100644
--- a/src/plugins/projectexplorer/buildmanager.cpp
+++ b/src/plugins/projectexplorer/buildmanager.cpp
@@ -836,6 +836,7 @@ bool BuildManager::buildQueueAppend(const QList<BuildItem> &items, const QString
                               .arg(item.buildStep->displayName()), BuildStep::OutputFormat::Stderr);
         for (BuildStep *buildStep : std::as_const(connectedSteps))
             disconnectOutput(buildStep);
+        d->m_outputWindow->popup(IOutputPane::NoModeSwitch);
         return false;
     }
 
@@ -843,6 +844,9 @@ bool BuildManager::buildQueueAppend(const QList<BuildItem> &items, const QString
     d->m_maxProgress += enabledCount;
     for (const BuildItem &item : items)
         incrementActiveBuildSteps(item.buildStep);
+    if (CompileOutputSettings::instance().popUp())
+        d->m_outputWindow->popup(IOutputPane::NoModeSwitch);
+    startBuildQueue();
     return true;
 }
 
@@ -862,27 +866,16 @@ bool BuildManager::buildLists(const QList<BuildStepList *> &bsls, const QStringL
         d->m_isDeploying = d->m_isDeploying || list->id() == Constants::BUILDSTEPS_DEPLOY;
     }
 
-    if (!buildQueueAppend(buildItems, preambleMessage)) {
-        d->m_outputWindow->popup(IOutputPane::NoModeSwitch);
-        d->m_isDeploying = false;
-        return false;
-    }
+    if (buildQueueAppend(buildItems, preambleMessage))
+        return true;
 
-    if (CompileOutputSettings::instance().popUp())
-        d->m_outputWindow->popup(IOutputPane::NoModeSwitch);
-    startBuildQueue();
-    return true;
+    d->m_isDeploying = false;
+    return false;
 }
 
 void BuildManager::appendStep(BuildStep *step, const QString &name)
 {
-    if (!buildQueueAppend({{step, step->enabled(), name}})) {
-        d->m_outputWindow->popup(IOutputPane::NoModeSwitch);
-        return;
-    }
-    if (CompileOutputSettings::instance().popUp())
-        d->m_outputWindow->popup(IOutputPane::NoModeSwitch);
-    startBuildQueue();
+    buildQueueAppend({{step, step->enabled(), name}});
 }
 
 template <class T>