From 85b7833a3e15c83598010f4fd807d29fa847dcb6 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 5 Dec 2019 14:06:16 +0100
Subject: [PATCH] Qmake: Simplify collection of available builds

No need for temporary list.

Change-Id: I77c2bace2c4b4eea95b36f8a075e07850ca8a4f6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 .../qmakebuildconfiguration.cpp                | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
index 2e852376e69..69bc52f7fcf 100644
--- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
@@ -788,15 +788,6 @@ BuildInfo QmakeBuildConfigurationFactory::createBuildInfo(const Kit *k,
     return info;
 }
 
-static const QList<BuildConfiguration::BuildType> availableBuildTypes(const BaseQtVersion *version)
-{
-    QList<BuildConfiguration::BuildType> types = {BuildConfiguration::Debug,
-                                                  BuildConfiguration::Release};
-    if (version && version->qtVersion().majorVersion > 4)
-        types << BuildConfiguration::Profile;
-    return types;
-}
-
 QList<BuildInfo> QmakeBuildConfigurationFactory::availableBuilds(const Kit *k, const FilePath &projectPath, bool forSetup) const
 {
     QList<BuildInfo> result;
@@ -806,16 +797,19 @@ QList<BuildInfo> QmakeBuildConfigurationFactory::availableBuilds(const Kit *k, c
     if (forSetup && (!qtVersion || !qtVersion->isValid()))
         return {};
 
-
-    for (BuildConfiguration::BuildType buildType : availableBuildTypes(qtVersion)) {
+    const auto addBuild = [&](BuildConfiguration::BuildType buildType) {
         BuildInfo info = createBuildInfo(k, projectPath, buildType);
         if (!forSetup) {
             info.displayName.clear(); // ask for a name
             info.buildDirectory.clear(); // This depends on the displayName
         }
         result << info;
+    };
 
-    }
+    addBuild(BuildConfiguration::Debug);
+    addBuild(BuildConfiguration::Release);
+    if (qtVersion && qtVersion->qtVersion().majorVersion > 4)
+        addBuild(BuildConfiguration::Profile);
 
     return result;
 }