QmakeProject: Make availableBuildTargets return a BuildTargetInfo list

It's what the "consumer side" expects.

Change-Id: I1a4e75eda09f8626fcf65290e6c58a08eed9fdca
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 7 insertions, 16 deletions

diff --git a/src/plugins/ios/iosrunfactories.cpp b/src/plugins/ios/iosrunfactories.cpp
index 910367288d..1cc83f3911 100644
--- a/src/plugins/ios/iosrunfactories.cpp
+++ b/src/plugins/ios/iosrunfactories.cpp
@@ -53,28 +53,19 @@ IosRunConfigurationFactory::IosRunConfigurationFactory(QObject *parent)
 
 bool IosRunConfigurationFactory::canCreateHelper(Target *parent, const QString &buildTarget) const
 {
-    auto project = static_cast<QmakeProject *>(parent->project());
-    const QList<QString> buildTargets = project->buildTargets(UserCreate, {ProjectType::ApplicationTemplate,
-                                                                           ProjectType::SharedLibraryTemplate,
-                                                                           ProjectType::AuxTemplate});
-
-    return buildTargets.contains(buildTarget);
+    const QList<BuildTargetInfo> buildTargets = availableBuildTargets(parent, UserCreate);
+    return Utils::contains(buildTargets, [buildTarget](const BuildTargetInfo &bti) {
+        return bti.targetName == buildTarget;
+    });
 }
 
 QList<BuildTargetInfo>
     IosRunConfigurationFactory::availableBuildTargets(Target *parent, CreationMode mode) const
 {
     auto project = static_cast<QmakeProject *>(parent->project());
-    const QList<QString> buildTargets = project->buildTargets(mode, {ProjectType::ApplicationTemplate,
-                                                                     ProjectType::SharedLibraryTemplate,
-                                                                     ProjectType::AuxTemplate});
-
-    return Utils::transform(buildTargets, [](const QString &buildTarget) {
-        BuildTargetInfo bti;
-        bti.targetName = buildTarget;
-        bti.displayName = QFileInfo(buildTarget).completeBaseName();
-        return bti;
-    });
+    return project->buildTargets(mode, {ProjectType::ApplicationTemplate,
+                                        ProjectType::SharedLibraryTemplate,
+                                        ProjectType::AuxTemplate});
 }
 
 QList<RunConfiguration *> IosRunConfigurationFactory::runConfigurationsForNode(Target *t, const Node *n)