Merge remote-tracking branch 'origin/4.6'

Change-Id: Icd367ad5b496c038df0892afe98d2eb61efb6095

1 files changed, 6 insertions, 2 deletions

diff --git a/plugins/haskell/haskellrunconfiguration.cpp b/plugins/haskell/haskellrunconfiguration.cpp
index 87514e3..661fa05 100644
--- a/plugins/haskell/haskellrunconfiguration.cpp
+++ b/plugins/haskell/haskellrunconfiguration.cpp
@@ -51,12 +51,16 @@ HaskellRunConfigurationFactory::HaskellRunConfigurationFactory()
     setSupportedTargetDeviceTypes({ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE});
 }
 
-QList<QString> HaskellRunConfigurationFactory::availableBuildTargets(
+QList<BuildTargetInfo> HaskellRunConfigurationFactory::availableBuildTargets(
     Target *parent, IRunConfigurationFactory::CreationMode mode) const
 {
     Q_UNUSED(mode)
     const auto project = HaskellProject::toHaskellProject(parent->project());
-    return project ? project->availableExecutables() : QList<QString>();
+    if (!project)
+        return {};
+    return Utils::transform(project->availableExecutables(), [](const QString &name) {
+        return BuildTargetInfo(name, Utils::FileName(), Utils::FileName());
+    });
 }
 
 HaskellRunConfiguration::HaskellRunConfiguration(Target *parent)