summaryrefslogtreecommitdiff
path: root/src/plugins/remotelinux
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2019-06-19 13:28:14 +0200
committerhjk <hjk@qt.io>2019-06-19 13:44:30 +0000
commitf42078846545be8114d1bfc261d21f60bed793b7 (patch)
treee44a6095340e8e63e77183783cc9c7cbd9e95454 /src/plugins/remotelinux
parente2d6c0bfeace907083e32a87e2e800edb358b075 (diff)
downloadqt-creator-f42078846545be8114d1bfc261d21f60bed793b7.tar.gz
ProjectExplorer: Make Device::displayType a data member
Change-Id: If650f660e3b10bc28d575ded07a854f59be26f87 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/remotelinux')
-rw-r--r--src/plugins/remotelinux/linuxdevice.cpp7
-rw-r--r--src/plugins/remotelinux/linuxdevice.h1
2 files changed, 2 insertions, 6 deletions
diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp
index 6e05739c01..b7cf627aba 100644
--- a/src/plugins/remotelinux/linuxdevice.cpp
+++ b/src/plugins/remotelinux/linuxdevice.cpp
@@ -172,11 +172,6 @@ class LinuxPortsGatheringMethod : public PortsGatheringMethod
}
};
-QString LinuxDevice::displayType() const
-{
- return tr("Generic Linux");
-}
-
IDeviceWidget *LinuxDevice::createWidget()
{
return new GenericLinuxDeviceConfigurationWidget(sharedFromThis());
@@ -189,6 +184,8 @@ Utils::OsType LinuxDevice::osType() const
LinuxDevice::LinuxDevice()
{
+ setDisplayType(tr("Generic Linux"));
+
addDeviceAction({tr("Deploy Public Key..."), [](const IDevice::Ptr &device, QWidget *parent) {
if (auto d = PublicKeyDeploymentDialog::createDialog(device, parent)) {
d->exec();
diff --git a/src/plugins/remotelinux/linuxdevice.h b/src/plugins/remotelinux/linuxdevice.h
index 18faf4ae05..112830860a 100644
--- a/src/plugins/remotelinux/linuxdevice.h
+++ b/src/plugins/remotelinux/linuxdevice.h
@@ -44,7 +44,6 @@ public:
static Ptr create() { return Ptr(new LinuxDevice); }
- QString displayType() const override;
ProjectExplorer::IDeviceWidget *createWidget() override;
Utils::OsType osType() const override;