From 30bd144540dfe29e655ccf9ae63504794da99ab4 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 2 Oct 2018 15:27:02 +0200
Subject: [PATCH] RemoteLinux: Add target information to runconfig name

Was there until 4.6.

Change-Id: I044e9a184a3f495f967bfa6712f1cd5cbe5603d5
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 .../remotelinux/remotelinuxrunconfiguration.cpp       | 11 +----------
 src/plugins/remotelinux/remotelinuxrunconfiguration.h |  3 ---
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
index 6ef5f29a954..cbd02d72fd6 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 c3d263dcb71..839da13ae5d 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();
 };