From 4c1ce54d17aebb2ea850e767ee0a29a5f14dea2d Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Mon, 25 Nov 2019 17:04:16 +0100
Subject: [PATCH] BareMetal: Use new runconfiguration aspect update mechanism

Change-Id: I4847481d3df603d730caf8657305877fe6b5d27e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 .../baremetal/baremetalrunconfiguration.cpp    | 18 ++++++++----------
 .../baremetal/baremetalrunconfiguration.h      |  3 ---
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/plugins/baremetal/baremetalrunconfiguration.cpp b/src/plugins/baremetal/baremetalrunconfiguration.cpp
index 87ec9d1deae..2072ab6c3e7 100644
--- a/src/plugins/baremetal/baremetalrunconfiguration.cpp
+++ b/src/plugins/baremetal/baremetalrunconfiguration.cpp
@@ -50,17 +50,15 @@ BareMetalRunConfiguration::BareMetalRunConfiguration(Target *target, Core::Id id
     addAspect<ArgumentsAspect>();
     addAspect<WorkingDirectoryAspect>();
 
-    connect(target, &Target::kitChanged,
-            this, &BareMetalRunConfiguration::updateTargetInformation); // Handles device changes, etc.
-    connect(target, &Target::buildSystemUpdated,
-            this, &BareMetalRunConfiguration::updateTargetInformation);
-}
+    setUpdater([this, exeAspect] {
+        const BuildTargetInfo bti = buildTargetInfo();
+        exeAspect->setExecutable(bti.targetFilePath);
+        emit enabledChanged();
+    });
 
-void BareMetalRunConfiguration::updateTargetInformation()
-{
-    const BuildTargetInfo bti = buildTargetInfo();
-    aspect<ExecutableAspect>()->setExecutable(bti.targetFilePath);
-    emit enabledChanged();
+    // Handles device changes, etc.
+    connect(target, &Target::kitChanged, this, &RunConfiguration::update);
+    connect(target, &Target::buildSystemUpdated, this, &RunConfiguration::update);
 }
 
 const char *BareMetalRunConfiguration::IdPrefix = "BareMetalCustom";
diff --git a/src/plugins/baremetal/baremetalrunconfiguration.h b/src/plugins/baremetal/baremetalrunconfiguration.h
index dfc426e8c2d..8855add2155 100644
--- a/src/plugins/baremetal/baremetalrunconfiguration.h
+++ b/src/plugins/baremetal/baremetalrunconfiguration.h
@@ -40,9 +40,6 @@ public:
     explicit BareMetalRunConfiguration(ProjectExplorer::Target *target, Core::Id id);
 
     static const char *IdPrefix;
-
-private:
-    void updateTargetInformation();
 };
 
 // BareMetalRunConfigurationFactory