From 8c527a136c2bc72f23afaf85b39fb3f993a3cdad Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Wed, 18 Sep 2024 14:18:21 +0200
Subject: [PATCH] ProjectExplorer: Update build actions on change of active
 project

... regardless from where the change originated.

Fixes: QTCREATORBUG-31579
Change-Id: Id87593f91b670e01278d4c30e73775d018fc6571
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 .../projectexplorer/projectexplorer.cpp       | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 8838a37645b..ca7776940f4 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -504,8 +504,6 @@ public:
     void duplicateFile();
     void deleteFile();
     void handleRenameFile();
-    void handleSetStartupProject();
-    void setStartupProject(Project *project);
     bool closeAllFilesInProject(const Project *project);
 
     void checkRecentProjectsAsync();
@@ -876,6 +874,8 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
             dd, &ProjectExplorerPluginPrivate::updateActions);
     connect(SessionManager::instance(), &SessionManager::sessionLoaded,
             dd, &ProjectExplorerPluginPrivate::updateActions);
+    connect(ProjectManager::instance(), &ProjectManager::startupProjectChanged,
+            dd, &ProjectExplorerPluginPrivate::updateActions);
     connect(SessionManager::instance(), &SessionManager::sessionLoaded,
             dd, &ProjectExplorerPluginPrivate::updateWelcomePage);
     connect(SessionManager::instance(), &SessionManager::sessionLoaded,
@@ -1827,7 +1827,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
     connect(dd->m_renameFileAction, &QAction::triggered,
             dd, &ProjectExplorerPluginPrivate::handleRenameFile);
     connect(dd->m_setStartupProjectAction, &QAction::triggered,
-            dd, &ProjectExplorerPluginPrivate::handleSetStartupProject);
+            dd, [] { ProjectManager::setStartupProject(ProjectTree::currentProject()); });
     connect(dd->m_closeProjectFilesActionFileMenu, &QAction::triggered,
             dd, [] { dd->closeAllFilesInProject(ProjectManager::projects().first()); });
     connect(dd->m_closeProjectFilesActionContextMenu, &QAction::triggered,
@@ -2153,14 +2153,6 @@ void ProjectExplorerPlugin::openNewProjectDialog()
     }
 }
 
-void ProjectExplorerPluginPrivate::setStartupProject(Project *project)
-{
-    if (!project)
-        return;
-    ProjectManager::setStartupProject(project);
-    updateActions();
-}
-
 bool ProjectExplorerPluginPrivate::closeAllFilesInProject(const Project *project)
 {
     QTC_ASSERT(project, return false);
@@ -3928,11 +3920,6 @@ ProjectExplorerPlugin::renameFile(Node *node, const QString &newFileName)
     return {};
 }
 
-void ProjectExplorerPluginPrivate::handleSetStartupProject()
-{
-    setStartupProject(ProjectTree::currentProject());
-}
-
 void ProjectExplorerPlugin::setAppOutputSettings(const AppOutputSettings &settings)
 {
     dd->m_outputPane.setSettings(settings);