Re-inline some of the RunConfiguration::setUpdater()

... after the latest 4.11 -> master merge

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

2 files changed, 9 insertions, 12 deletions

diff --git a/src/plugins/boot2qt/qdbrunconfiguration.cpp b/src/plugins/boot2qt/qdbrunconfiguration.cpp
index dfbf594a16..97aa4a01e5 100644
--- a/src/plugins/boot2qt/qdbrunconfiguration.cpp
+++ b/src/plugins/boot2qt/qdbrunconfiguration.cpp
@@ -86,7 +86,15 @@ QdbRunConfiguration::QdbRunConfiguration(Target *target, Core::Id id)
     addAspect<WorkingDirectoryAspect>();
     addAspect<FullCommandLineAspect>(this);
 
-    setUpdater([this] { updateTargetInformation(); });
+    setUpdater([this, target, exeAspect, symbolsAspect] {
+        const BuildTargetInfo bti = buildTargetInfo();
+        const FilePath localExecutable = bti.targetFilePath;
+        const DeployableFile depFile = target->deploymentData().deployableForLocalFile(localExecutable);
+
+        exeAspect->setExecutable(FilePath::fromString(depFile.remoteFilePath()));
+        symbolsAspect->setFilePath(localExecutable);
+    });
+
     connect(target, &Target::buildSystemUpdated, this, &RunConfiguration::update);
 
     setDefaultDisplayName(tr("Run on Boot2Qt Device"));
@@ -102,16 +110,6 @@ Tasks QdbRunConfiguration::checkForIssues() const
     return tasks;
 }
 
-void QdbRunConfiguration::updateTargetInformation()
-{
-    const BuildTargetInfo bti = buildTargetInfo();
-    const FilePath localExecutable = bti.targetFilePath;
-    const DeployableFile depFile = target()->deploymentData().deployableForLocalFile(localExecutable);
-
-    aspect<ExecutableAspect>()->setExecutable(FilePath::fromString(depFile.remoteFilePath()));
-    aspect<SymbolFileAspect>()->setFilePath(localExecutable);
-}
-
 QString QdbRunConfiguration::defaultDisplayName() const
 {
     return RunConfigurationFactory::decoratedTargetName(buildKey(), target());
diff --git a/src/plugins/boot2qt/qdbrunconfiguration.h b/src/plugins/boot2qt/qdbrunconfiguration.h
index 1361428e3f..0804d269ed 100644
--- a/src/plugins/boot2qt/qdbrunconfiguration.h
+++ b/src/plugins/boot2qt/qdbrunconfiguration.h
@@ -47,7 +47,6 @@ public:
 
 private:
     ProjectExplorer::Tasks checkForIssues() const override;
-    void updateTargetInformation();
     QString defaultDisplayName() const;
 };