aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qnx
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2019-08-16 10:17:45 +0200
committerhjk <hjk@qt.io>2019-08-19 07:44:45 +0000
commit36d98d4af75414ef1c6fb876d8fd5b59bbe2f54b (patch)
treea9f4763affa0ca96ccef533e51c23dd1e23ad20f /src/plugins/qnx
parentb6618ab6322d5d62b47c57aa86c32ef4be4734bb (diff)
ProjectExplorer: Base IDevice::osType on a data member
Change-Id: I969563e6e62895a51fb4692c8eb0bab278f0ecae Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/qnx')
-rw-r--r--src/plugins/qnx/qnxdevice.cpp7
-rw-r--r--src/plugins/qnx/qnxdevice.h2
2 files changed, 2 insertions, 7 deletions
diff --git a/src/plugins/qnx/qnxdevice.cpp b/src/plugins/qnx/qnxdevice.cpp
index 6f511997b6..da5e5ca11e 100644
--- a/src/plugins/qnx/qnxdevice.cpp
+++ b/src/plugins/qnx/qnxdevice.cpp
@@ -84,17 +84,14 @@ QnxDevice::QnxDevice()
{
setDisplayType(tr("QNX"));
setDefaultDisplayName(tr("QNX Device"));
+ setOsType(OsTypeOtherUnix);
+
addDeviceAction({tr("Deploy Qt libraries..."), [](const IDevice::Ptr &device, QWidget *parent) {
QnxDeployQtLibrariesDialog dialog(device, parent);
dialog.exec();
}});
}
-OsType QnxDevice::osType() const
-{
- return OsTypeOtherUnix;
-}
-
int QnxDevice::qnxVersion() const
{
if (m_versionNumber == 0)
diff --git a/src/plugins/qnx/qnxdevice.h b/src/plugins/qnx/qnxdevice.h
index 31590cc096..3cd7a069f9 100644
--- a/src/plugins/qnx/qnxdevice.h
+++ b/src/plugins/qnx/qnxdevice.h
@@ -49,8 +49,6 @@ public:
ProjectExplorer::DeviceTester *createDeviceTester() const override;
ProjectExplorer::DeviceProcess *createProcess(QObject *parent) const override;
- Utils::OsType osType() const override;
-
int qnxVersion() const;
void fromMap(const QVariantMap &map) override;