diff options
author | hjk <hjk@qt.io> | 2018-02-15 16:52:50 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2018-02-16 07:32:51 +0000 |
commit | 231a9d2c580b6a5d2d2028f5db15a5274f3825dd (patch) | |
tree | 1bf65275ba9a055cf2d11c60ced8cd8fdba4e2bd /src/plugins/remotelinux | |
parent | a3154bf299b0c71033d74b87fe8bf9362db5c31e (diff) | |
download | qt-creator-231a9d2c580b6a5d2d2028f5db15a5274f3825dd.tar.gz |
RemoteLinux: Also decorate empty/invalid targets with device name
Change-Id: Iff9f80490ba3a59e0c17b28acd2376cfc0bf9d87
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/remotelinux')
-rw-r--r-- | src/plugins/remotelinux/remotelinuxrunconfiguration.cpp | 7 | ||||
-rw-r--r-- | src/plugins/remotelinux/remotelinuxrunconfiguration.h | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp index 6b02914720..7b5c9ad7e1 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp +++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp @@ -155,12 +155,9 @@ bool RemoteLinuxRunConfiguration::fromMap(const QVariantMap &map) return true; } -QString RemoteLinuxRunConfiguration::defaultDisplayName() +QString RemoteLinuxRunConfiguration::defaultDisplayName() const { - if (!d->targetName.isEmpty()) - return IRunConfigurationFactory::decoratedTargetName(d->targetName, target()); - //: Remote Linux run configuration default display name - return tr("Run on Remote Device"); + return IRunConfigurationFactory::decoratedTargetName(d->targetName, target()); } QString RemoteLinuxRunConfiguration::arguments() const diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.h b/src/plugins/remotelinux/remotelinuxrunconfiguration.h index 466ae3432b..e60fd1ffa5 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfiguration.h +++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.h @@ -80,7 +80,7 @@ protected: QString extraId() const override; private: - QString defaultDisplayName(); + QString defaultDisplayName() const; void handleBuildSystemDataUpdated(); Internal::RemoteLinuxRunConfigurationPrivate * const d; |