From 8584f4e98ca1f11caf5aada1c367a79f65797859 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Fri, 7 Sep 2018 15:26:10 +0200
Subject: Avoid use of RunConfigurationAspect::runConfiguration

Change-Id: I280e2f79a7c427d1a582f20fd0fbcb09909d8e55
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 plugins/haskell/haskellrunconfiguration.cpp | 18 ++++++++----------
 plugins/haskell/haskellrunconfiguration.h   |  1 -
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/plugins/haskell/haskellrunconfiguration.cpp b/plugins/haskell/haskellrunconfiguration.cpp
index 980e4fd..b2b4b7f 100644
--- a/plugins/haskell/haskellrunconfiguration.cpp
+++ b/plugins/haskell/haskellrunconfiguration.cpp
@@ -53,25 +53,23 @@ HaskellExecutableAspect::HaskellExecutableAspect(RunConfiguration *rc)
 {
     setSettingsKey("Haskell.Executable");
     setLabelText(tr("Executable"));
-    connect(rc->target(), &Target::applicationTargetsChanged,
-            this, &HaskellExecutableAspect::update);
-}
-
-void HaskellExecutableAspect::update()
-{
-    RunConfiguration *rc = runConfiguration();
-    BuildTargetInfo bti = rc->target()->applicationTargets().buildTargetInfo(rc->buildKey());
-    setValue(bti.targetFilePath.toString());
 }
 
 HaskellRunConfiguration::HaskellRunConfiguration(Target *target, Core::Id id)
     : RunConfiguration(target, id)
 {
-    addAspect<HaskellExecutableAspect>();
+    auto executableAspect = addAspect<HaskellExecutableAspect>();
+    connect(target, &Target::applicationTargetsChanged, this, [this, target, executableAspect] {
+        BuildTargetInfo bti = target->applicationTargets().buildTargetInfo(buildKey());
+        executableAspect->setValue(bti.targetFilePath.toString());
+    });
+
     addAspect<ArgumentsAspect>();
+
     auto workingDirAspect = addAspect<WorkingDirectoryAspect>();
     workingDirAspect->setDefaultWorkingDirectory(target->project()->projectDirectory());
     workingDirAspect->setVisible(false);
+
     addAspect<TerminalAspect>();
     addAspect<LocalEnvironmentAspect>(LocalEnvironmentAspect::BaseEnvironmentModifier());
 }
diff --git a/plugins/haskell/haskellrunconfiguration.h b/plugins/haskell/haskellrunconfiguration.h
index 8af9a18..01cc352 100644
--- a/plugins/haskell/haskellrunconfiguration.h
+++ b/plugins/haskell/haskellrunconfiguration.h
@@ -42,7 +42,6 @@ class HaskellExecutableAspect : public ProjectExplorer::BaseStringAspect
 
 public:
     HaskellExecutableAspect(ProjectExplorer::RunConfiguration *rc);
-    void update();
 };
 
 class HaskellRunConfiguration : public ProjectExplorer::RunConfiguration
-- 
cgit v1.2.3