Qnx: Have a proper default device icon

Themable and HighDPI-able.

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

10 files changed, 55 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
diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg
index d27d37665e..297f6aaff1 100644
--- a/src/tools/icons/qtcreatoricons.svg
+++ b/src/tools/icons/qtcreatoricons.svg
@@ -8638,6 +8638,49 @@
          height="100%" />
     </g>
     <g
+       transform="translate(-103.75,310.5)"
+       id="src/plugins/qnx/images/qnxdevice">
+      <use
+         transform="translate(458.75,5.5)"
+         style="display:inline"
+         x="0"
+         y="0"
+         xlink:href="#backgroundRect_32_28"
+         id="use5913-0-8-1-5-6-8-74-5-1"
+         width="100%"
+         height="100%" />
+      <path
+         id="blackberry"
+         d="m 515.06297,73.5 h -3.15014 l 0.85972,-4 h 3.02638 c 1.96151,0 2.4261,1.015671 2.4261,1.774073 0,1.070118 -0.69797,2.225927 -3.16206,2.225927 m 8.5136,-2.5 h -3.14687 l 0.85972,-4 h 3.01986 c 1.9626,0 2.4272,1.116222 2.4272,1.868193 C 526.73648,69.942592 526.0385,71 523.57657,71 M 524.75,65 h -3.14796 l 0.85972,-4 h 3.02313 c 1.95933,0 2.4261,0.940839 2.4261,1.69602 0,1.071189 -0.70123,2.30398 -3.16099,2.30398 m -8.51252,2.577828 h -3.15556 L 513.94164,63.5 h 3.02855 c 1.95826,0 2.42502,0.843508 2.42502,1.6019 0,1.070119 -0.69907,2.475928 -3.15773,2.475928 m -8.14671,0 h -3.14796 L 505.80035,63.5 h 3.02205 c 1.96259,0 2.42936,0.843508 2.42936,1.6019 0,1.070119 -0.70015,2.475928 -3.16099,2.475928 M 517.32516,61.5 h -3.15123 l 0.85864,-4 h 3.02855 c 1.95934,0 2.42285,0.917706 2.42285,1.672896 0,1.071189 -0.69906,2.327104 -3.15881,2.327104 m -8.14237,0 h -3.14905 l 0.85972,-4 h 3.01879 c 1.96368,0 2.43153,0.917706 2.43153,1.672896 0,1.071189 -0.70124,2.327104 -3.16099,2.327104"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccssccccssccccssccccssccccssccccssccccssc" />
+      <path
+         id="path3909-9"
+         d="m 521.75,54.500748 v -4.981742 l 2.95707,2.459226 z M 511.18081,52.065359 510.83284,51.5 h -2.78812 l 2.03148,1.617477 c -0.49426,0.153392 -1.12523,0.430859 -1.70723,0.430859 -0.71452,0 -1.92399,-0.321794 -2.38436,-0.578386 -0.44254,-0.247107 -0.44462,-0.651625 -0.44462,-1.022467 0,-0.370476 7.9e-4,-0.847848 0.44462,-1.094219 0.46037,-0.256625 1.67019,-0.500015 2.38436,-0.500015 0.71381,0 1.91697,0.257662 2.38435,0.500015 0.48868,0.253328 0.42749,1.212098 0.42749,1.212098 M 530.25,49.481268 h -2.62516 l -1.60552,1.351125 -1.60487,-1.351125 H 519.75 v 3.382879 l -3.6299,-3.382879 -2.3701,-2.74e-4 v 4.132984 l -1.19187,-0.506386 c 0.11364,-0.389513 0.11671,-0.813799 0.11671,-1.160112 0,-0.662977 -0.003,-1.685442 -0.79489,-2.126935 -0.82355,-0.458699 -2.23406,-0.56523 -3.51098,-0.56523 -1.27696,0 -2.91534,0.106531 -3.73927,0.56523 -0.79209,0.441493 -0.79455,1.463958 -0.79455,2.126935 0,0.662974 0.004,1.614423 0.79455,2.054816 0.82428,0.460535 2.46128,0.522414 3.73927,0.522414 1.07454,0 2.40078,-0.03221 3.28657,-0.329489 l 0.4964,0.304032 h 3.26835 v -3.40328 l 3.82072,3.40328 h 5.18083 l 1.59748,-1.375555 1.59786,1.375555 h 2.62516 l -2.91041,-2.521021 z"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccscscsccccccccccccscscscsccccccccccc" />
+    </g>
+    <g
+       id="src/plugins/qnx/images/qnxdevicesmall"
+       transform="translate(-174,27)">
+      <use
+         x="0"
+         y="0"
+         xlink:href="#backgroundRect"
+         id="use6054-1-3"
+         width="100%"
+         height="100%"
+         transform="translate(586,-73)" />
+      <use
+         transform="matrix(0.60951707,0,0,0.80579423,263.28972,318.71157)"
+         x="0"
+         y="0"
+         xlink:href="#blackberry"
+         id="use1449"
+         width="100%"
+         height="100%" />
+    </g>
+    <g
        id="src/plugins/winrt/images/winrtdevice"
        transform="translate(-206,-74)">
       <use