From cf65db29e7de4bbaa484008786493b765ef411bc Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Tue, 23 Jul 2019 13:07:05 +0200
Subject: [PATCH] CMake: Update target list in build step list widget

Update the target list in the build step list widget for CMakeBuildSteps,
even when "current executable" meta-target is selected.

This change was cherry-picked from master branch:
ce7407dc03d94b034d5079944e2dd2d38f187815

Change-Id: Ifc1d8dc67894202eb38fe6088552797b198c7463
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/cmakeprojectmanager/cmakebuildstep.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
index cc2bcbfeb60..a46de056426 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
@@ -113,10 +113,10 @@ void CMakeBuildStep::handleBuildTargetChanges(bool success)
 {
     if (!success)
         return; // Do not change when parsing failed.
-    if (isCurrentExecutableTarget(m_buildTarget))
-        return; // Do not change just because a different set of build targets is there...
-    if (!static_cast<CMakeProject *>(project())->buildTargetTitles().contains(m_buildTarget))
+    if (!isCurrentExecutableTarget(m_buildTarget)
+        && !static_cast<CMakeProject *>(project())->buildTargetTitles().contains(m_buildTarget)) {
         setBuildTarget(allTarget());
+    }
     emit buildTargetsChanged();
 }