diff options
| author | hjk <hjk@qt.io> | 2019-12-17 13:44:06 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-12-18 12:00:58 +0000 |
| commit | 9f3614fdbf154467fc3ac6bb7f6f8dc4783be673 (patch) | |
| tree | 1441cee306e85a94c074cca713b34cc9c9931dca /src/plugins/remotelinux | |
| parent | 548e7988852f2d3d9623877be132553704534b44 (diff) | |
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>
Diffstat (limited to 'src/plugins/remotelinux')
| -rw-r--r-- | src/plugins/remotelinux/remotelinuxrunconfiguration.cpp | 23 | ||||
| -rw-r--r-- | src/plugins/remotelinux/remotelinuxrunconfiguration.h | 1 |
2 files changed, 10 insertions, 14 deletions
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 |