Qnx: Have a proper default device icon

Themable and HighDPI-able.

Change-Id: Ieefa19f3a569d9b9fbb3349f9bb6ac67453eff1f
Reviewed-by: hjk <hjk@qt.io>

9 files changed, 12 insertions, 4 deletions

diff --git a/src/plugins/qnx/images/qnx-target.png b/src/plugins/qnx/images/qnx-target.png
deleted file mode 100644
index be59d15b82..0000000000
--- a/src/plugins/qnx/images/qnx-target.png
+++ /dev/null
diff --git a/src/plugins/qnx/images/qnxdevice.png b/src/plugins/qnx/images/qnxdevice.png
new file mode 100644
index 0000000000..fedd002bf7
--- /dev/null
+++ b/src/plugins/qnx/images/qnxdevice.png
diff --git a/src/plugins/qnx/images/qnxdevice@2x.png b/src/plugins/qnx/images/qnxdevice@2x.png
new file mode 100644
index 0000000000..0634693aa4
--- /dev/null
+++ b/src/plugins/qnx/images/qnxdevice@2x.png
diff --git a/src/plugins/qnx/images/qnxdevicesmall.png b/src/plugins/qnx/images/qnxdevicesmall.png
new file mode 100644
index 0000000000..34a5ba9432
--- /dev/null
+++ b/src/plugins/qnx/images/qnxdevicesmall.png
diff --git a/src/plugins/qnx/images/qnxdevicesmall@2x.png b/src/plugins/qnx/images/qnxdevicesmall@2x.png
new file mode 100644
index 0000000000..ab2100c1e9
--- /dev/null
+++ b/src/plugins/qnx/images/qnxdevicesmall@2x.png
diff --git a/src/plugins/qnx/qnx.qrc b/src/plugins/qnx/qnx.qrc
index 97a16398cc..7a7d425e8d 100644
--- a/src/plugins/qnx/qnx.qrc
+++ b/src/plugins/qnx/qnx.qrc
@@ -1,5 +1,8 @@
 <RCC>
     <qresource prefix="/qnx">
-        <file>images/qnx-target.png</file>
+        <file>images/qnxdevice.png</file>
+        <file>images/qnxdevice@2x.png</file>
+        <file>images/qnxdevicesmall.png</file>
+        <file>images/qnxdevicesmall@2x.png</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/qnx/qnxconfiguration.cpp b/src/plugins/qnx/qnxconfiguration.cpp
index 22718c6385..282e598085 100644
--- a/src/plugins/qnx/qnxconfiguration.cpp
+++ b/src/plugins/qnx/qnxconfiguration.cpp
@@ -320,7 +320,6 @@ ProjectExplorer::Kit *QnxConfiguration::createKit(
                     "Kit for %1 (%2)")
                 .arg(displayName())
                 .arg(target.shortDescription()));
-    kit->setIconPath(FileName::fromString(QLatin1String(Constants::QNX_CATEGORY_ICON)));
 
     kit->setAutoDetected(true);
     kit->setAutoDetectionSource(envFile().toString());
diff --git a/src/plugins/qnx/qnxconstants.h b/src/plugins/qnx/qnxconstants.h
index 979aa1e94e..63d9a2d50b 100644
--- a/src/plugins/qnx/qnxconstants.h
+++ b/src/plugins/qnx/qnxconstants.h
@@ -48,7 +48,6 @@ const char QNX_DEBUG_EXECUTABLE[] = "pdebug";
 const char QNX_TOOLCHAIN_ID[] = "Qnx.QccToolChain";
 
 // QNX settings constants
-const char QNX_CATEGORY_ICON[] = ":/qnx/images/qnx-target.png";
 const char QNX_SETTINGS_ID[] = "DD.Qnx Configuration";
 
 const char QNX_CONFIGS_FILENAME[] = "qnxconfigurations.xml";
diff --git a/src/plugins/qnx/qnxdevicefactory.cpp b/src/plugins/qnx/qnxdevicefactory.cpp
index f489c10d74..1546171afd 100644
--- a/src/plugins/qnx/qnxdevicefactory.cpp
+++ b/src/plugins/qnx/qnxdevicefactory.cpp
@@ -30,6 +30,7 @@
 #include "qnxdevice.h"
 
 #include <utils/qtcassert.h>
+#include <utils/icon.h>
 
 #include <QIcon>
 
@@ -55,7 +56,13 @@ QList<Core::Id> QnxDeviceFactory::availableCreationIds() const
 QIcon QnxDeviceFactory::iconForId(Core::Id type) const
 {
     Q_UNUSED(type)
-    return QIcon();
+    using namespace Utils;
+    static const QIcon icon =
+            Icon::combinedIcon({Icon({{":/qnx/images/qnxdevicesmall.png",
+                                       Theme::PanelTextColorDark}}, Icon::Tint),
+                                Icon({{":/qnx/images/qnxdevice.png",
+                                       Theme::IconsBaseColor}})});
+    return icon;
 }
 
 bool QnxDeviceFactory::canCreate() const