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>

6 files changed, 28 insertions, 40 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;
 };
 
diff --git a/src/plugins/qnx/qnxrunconfiguration.cpp b/src/plugins/qnx/qnxrunconfiguration.cpp
index edd6ccffcc..edbdc90d19 100644
--- a/src/plugins/qnx/qnxrunconfiguration.cpp
+++ b/src/plugins/qnx/qnxrunconfiguration.cpp
@@ -69,7 +69,15 @@ QnxRunConfiguration::QnxRunConfiguration(Target *target, Core::Id id)
     libAspect->setLabelText(tr("Path to Qt libraries on device"));
     libAspect->setDisplayStyle(BaseStringAspect::LineEditDisplay);
 
-    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);
+        emit enabledChanged();
+    });
 
     connect(target, &Target::buildSystemUpdated, this, &RunConfiguration::update);
 }
@@ -88,17 +96,6 @@ Runnable QnxRunConfiguration::runnable() const
     return r;
 }
 
-void QnxRunConfiguration::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);
-    emit enabledChanged();
-}
-
 // QnxRunConfigurationFactory
 
 QnxRunConfigurationFactory::QnxRunConfigurationFactory()
diff --git a/src/plugins/qnx/qnxrunconfiguration.h b/src/plugins/qnx/qnxrunconfiguration.h
index 17d20b84b5..75ec72a66c 100644
--- a/src/plugins/qnx/qnxrunconfiguration.h
+++ b/src/plugins/qnx/qnxrunconfiguration.h
@@ -48,8 +48,6 @@ public:
 
 private:
     ProjectExplorer::Runnable runnable() const override;
-
-    void updateTargetInformation();
 };
 
 class QnxRunConfigurationFactory final : public ProjectExplorer::RunConfigurationFactory
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
index b64075deae..2f351c2708 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
@@ -69,7 +69,16 @@ RemoteLinuxRunConfiguration::RemoteLinuxRunConfiguration(Target *target, Core::I
     if (HostOsInfo::isAnyUnixHost())
         addAspect<X11ForwardingAspect>();
 
-    setUpdater([this] { updateTargetInformation(); });
+    setUpdater([this, target, exeAspect, symbolsAspect] {
+        BuildTargetInfo bti = buildTargetInfo();
+        const FilePath localExecutable = bti.targetFilePath;
+        DeployableFile depFile = target->deploymentData().deployableForLocalFile(localExecutable);
+
+        exeAspect->setExecutable(FilePath::fromString(depFile.remoteFilePath()));
+        symbolsAspect->setFilePath(localExecutable);
+
+        emit enabledChanged();
+    });
 
     connect(target, &Target::buildSystemUpdated, this, &RunConfiguration::update);
     connect(target, &Target::kitChanged, this, &RunConfiguration::update);
@@ -84,18 +93,6 @@ Runnable RemoteLinuxRunConfiguration::runnable() const
     return r;
 }
 
-void RemoteLinuxRunConfiguration::updateTargetInformation()
-{
-    BuildTargetInfo bti = buildTargetInfo();
-    const FilePath localExecutable = bti.targetFilePath;
-    DeployableFile depFile = target()->deploymentData().deployableForLocalFile(localExecutable);
-
-    aspect<ExecutableAspect>()->setExecutable(FilePath::fromString(depFile.remoteFilePath()));
-    aspect<SymbolFileAspect>()->setFilePath(localExecutable);
-
-    emit enabledChanged();
-}
-
 // RemoteLinuxRunConfigurationFactory
 
 RemoteLinuxRunConfigurationFactory::RemoteLinuxRunConfigurationFactory()
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.h b/src/plugins/remotelinux/remotelinuxrunconfiguration.h
index b16925cfda..b854184b35 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.h
+++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.h
@@ -41,7 +41,6 @@ public:
 
 private:
     ProjectExplorer::Runnable runnable() const override;
-    void updateTargetInformation();
 };
 
 class RemoteLinuxRunConfigurationFactory final : public ProjectExplorer::RunConfigurationFactory