Qnx: Inline only use of QnxDeviceFactory::deviceType()

And add a comment to the secondary use of Constants::QNX_QNX_OS_TYPE
as device type.

Change-Id: I1ae4bda890c87500a23e1df5cb7fa6e4f1079c96
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

src/plugins/qnx/qnxconstants.h

@@ -41,7 +41,7 @@ const char QNX_QNX_RUNCONFIGURATION_PREFIX[] = "Qt4ProjectManager.QNX.QNXRunConf
 
 const char QNX_QNX_DEPLOYCONFIGURATION_ID[] = "Qt4ProjectManager.QNX.QNXDeployConfiguration";
 
-const char QNX_QNX_OS_TYPE[] = "QnxOsType";
+const char QNX_QNX_OS_TYPE[] = "QnxOsType"; // Also used for device type.
 
 const char QNX_DEBUG_EXECUTABLE[] = "pdebug";
 

src/plugins/qnx/qnxdevice.cpp

@@ -201,10 +201,5 @@ ProjectExplorer::IDevice::Ptr QnxDeviceFactory::create() const
     return wizard.device();
 }
 
-Core::Id QnxDeviceFactory::deviceType()
-{
-    return Core::Id(Constants::QNX_QNX_OS_TYPE);
-}
-
 } // namespace Internal
 } // namespace Qnx

src/plugins/qnx/qnxdevice.h

@@ -78,8 +78,6 @@ public:
     QnxDeviceFactory();
 
     ProjectExplorer::IDevice::Ptr create() const override;
-
-    static Core::Id deviceType();
 };
 
 } // namespace Internal

src/plugins/qnx/qnxplugin.cpp

@@ -88,7 +88,7 @@ public:
         setConfigBaseId(Constants::QNX_QNX_DEPLOYCONFIGURATION_ID);
         setDefaultDisplayName(QCoreApplication::translate("Qnx::Internal::QnxDeployConfiguration",
                                                           "Deploy to QNX Device"));
-        addSupportedTargetDeviceType(QnxDeviceFactory::deviceType());
+        addSupportedTargetDeviceType(Constants::QNX_QNX_OS_TYPE);
         setUseDeploymentDataView();
 
         addInitialStep(DeviceCheckBuildStep::stepId());