summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2018-10-02 15:27:02 +0200
committerhjk <hjk@qt.io>2018-10-02 14:52:50 +0000
commit30bd144540dfe29e655ccf9ae63504794da99ab4 (patch)
tree0a4f6fa933f274d2694c0e619990f07ebf74d8f3
parent049291504d493ee8126f7da723068c3d3c9c298e (diff)
downloadqt-creator-30bd144540dfe29e655ccf9ae63504794da99ab4.tar.gz
RemoteLinux: Add target information to runconfig name
Was there until 4.6. Change-Id: I044e9a184a3f495f967bfa6712f1cd5cbe5603d5 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--src/plugins/remotelinux/remotelinuxrunconfiguration.cpp11
-rw-r--r--src/plugins/remotelinux/remotelinuxrunconfiguration.h3
2 files changed, 1 insertions, 13 deletions
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
index 6ef5f29a95..cbd02d72fd 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
@@ -73,16 +73,6 @@ RemoteLinuxRunConfiguration::RemoteLinuxRunConfiguration(Target *target, Core::I
this, &RemoteLinuxRunConfiguration::updateTargetInformation);
}
-void RemoteLinuxRunConfiguration::doAdditionalSetup(const RunConfigurationCreationInfo &)
-{
- setDefaultDisplayName(defaultDisplayName());
-}
-
-QString RemoteLinuxRunConfiguration::defaultDisplayName() const
-{
- return RunConfigurationFactory::decoratedTargetName(buildKey(), target());
-}
-
void RemoteLinuxRunConfiguration::updateTargetInformation()
{
BuildTargetInfo bti = buildTargetInfo();
@@ -103,6 +93,7 @@ const char *RemoteLinuxRunConfiguration::IdPrefix = "RemoteLinuxRunConfiguration
RemoteLinuxRunConfigurationFactory::RemoteLinuxRunConfigurationFactory()
{
registerRunConfiguration<RemoteLinuxRunConfiguration>(RemoteLinuxRunConfiguration::IdPrefix);
+ setDecorateDisplayNames(true);
addSupportedTargetDeviceType(RemoteLinux::Constants::GenericLinuxOsType);
}
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.h b/src/plugins/remotelinux/remotelinuxrunconfiguration.h
index c3d263dcb7..839da13ae5 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.h
+++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.h
@@ -40,9 +40,6 @@ public:
static const char *IdPrefix;
private:
- void doAdditionalSetup(const ProjectExplorer::RunConfigurationCreationInfo &) override;
-
- QString defaultDisplayName() const;
void updateTargetInformation();
};