From adae0c3ae84dae0af86b8c3fb7339d120cb537f2 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Sat, 16 Sep 2017 12:03:38 +0200
Subject: [PATCH] Ssh: Move some Ssh specific images from Utils to Ssh

Removing the invalid resources dependency on Utils, cleaning up
the Utils images and prevent other places from using such unthemed
icons.

Change-Id: I78f5cfe1f48d0853c6c3e8822cbb041c232db426
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/libs/{utils => ssh}/images/dir.png         | Bin
 src/libs/{utils => ssh}/images/help.png        | Bin
 src/libs/{utils => ssh}/images/unknownfile.png | Bin
 src/libs/ssh/sftpfilesystemmodel.cpp           |   6 +++---
 src/libs/ssh/ssh.pro                           |   2 ++
 src/libs/ssh/ssh.qbs                           |   1 +
 src/libs/ssh/ssh.qrc                           |   7 +++++++
 src/libs/utils/utils.qrc                       |   3 ---
 src/plugins/coreplugin/systemsettings.ui       |   8 +-------
 9 files changed, 14 insertions(+), 13 deletions(-)
 rename src/libs/{utils => ssh}/images/dir.png (100%)
 rename src/libs/{utils => ssh}/images/help.png (100%)
 rename src/libs/{utils => ssh}/images/unknownfile.png (100%)
 create mode 100644 src/libs/ssh/ssh.qrc

diff --git a/src/libs/utils/images/dir.png b/src/libs/ssh/images/dir.png
similarity index 100%
rename from src/libs/utils/images/dir.png
rename to src/libs/ssh/images/dir.png
diff --git a/src/libs/utils/images/help.png b/src/libs/ssh/images/help.png
similarity index 100%
rename from src/libs/utils/images/help.png
rename to src/libs/ssh/images/help.png
diff --git a/src/libs/utils/images/unknownfile.png b/src/libs/ssh/images/unknownfile.png
similarity index 100%
rename from src/libs/utils/images/unknownfile.png
rename to src/libs/ssh/images/unknownfile.png
diff --git a/src/libs/ssh/sftpfilesystemmodel.cpp b/src/libs/ssh/sftpfilesystemmodel.cpp
index d3432c5528e..b1a173759c6 100644
--- a/src/libs/ssh/sftpfilesystemmodel.cpp
+++ b/src/libs/ssh/sftpfilesystemmodel.cpp
@@ -166,11 +166,11 @@ QVariant SftpFileSystemModel::data(const QModelIndex &index, int role) const
         switch (node->fileInfo.type) {
         case FileTypeRegular:
         case FileTypeOther:
-            return QIcon(":/utils/images/unknownfile.png");
+            return QIcon(":/ssh/images/unknownfile.png");
         case FileTypeDirectory:
-            return QIcon(":/utils/images/dir.png");
+            return QIcon(":/ssh/images/dir.png");
         case FileTypeUnknown:
-            return QIcon(":/utils/images/help.png"); // Shows a question mark.
+            return QIcon(":/ssh/images/help.png"); // Shows a question mark.
         }
     }
     if (index.column() == 1) {
diff --git a/src/libs/ssh/ssh.pro b/src/libs/ssh/ssh.pro
index 27be1ec1876..499540ac72e 100644
--- a/src/libs/ssh/ssh.pro
+++ b/src/libs/ssh/ssh.pro
@@ -82,4 +82,6 @@ HEADERS = $$PWD/sshsendfacility_p.h \
 
 FORMS = $$PWD/sshkeycreationdialog.ui
 
+RESOURCES += $$PWD/ssh.qrc
+
 include(../3rdparty/botan/botan.pri)
diff --git a/src/libs/ssh/ssh.qbs b/src/libs/ssh/ssh.qbs
index 54dad5bf754..3aa95a16d53 100644
--- a/src/libs/ssh/ssh.qbs
+++ b/src/libs/ssh/ssh.qbs
@@ -22,6 +22,7 @@ Project {
             "sftpoperation.cpp", "sftpoperation_p.h",
             "sftpoutgoingpacket.cpp", "sftpoutgoingpacket_p.h",
             "sftppacket.cpp", "sftppacket_p.h",
+            "ssh.qrc",
             "sshagent.cpp", "sshagent_p.h",
             "sshbotanconversions_p.h",
             "sshcapabilities_p.h", "sshcapabilities.cpp",
diff --git a/src/libs/ssh/ssh.qrc b/src/libs/ssh/ssh.qrc
new file mode 100644
index 00000000000..4b0c6a8c51c
--- /dev/null
+++ b/src/libs/ssh/ssh.qrc
@@ -0,0 +1,7 @@
+<RCC>
+    <qresource prefix="/ssh">
+        <file>images/dir.png</file>
+        <file>images/help.png</file>
+        <file>images/unknownfile.png</file>
+    </qresource>
+</RCC>
diff --git a/src/libs/utils/utils.qrc b/src/libs/utils/utils.qrc
index 4b09817cf84..63ca09e10f5 100644
--- a/src/libs/utils/utils.qrc
+++ b/src/libs/utils/utils.qrc
@@ -35,7 +35,6 @@
         <file>images/clean_pane_small@2x.png</file>
         <file>images/compile_error_taskbar.png</file>
         <file>images/compile_error_taskbar@2x.png</file>
-        <file>images/dir.png</file>
         <file>images/editcopy.png</file>
         <file>images/editcopy@2x.png</file>
         <file>images/editcut.png</file>
@@ -89,12 +88,10 @@
         <file>images/splitbutton_horizontal@2x.png</file>
         <file>images/undo.png</file>
         <file>images/undo@2x.png</file>
-        <file>images/unknownfile.png</file>
         <file>images/extension.png</file>
         <file>images/extension@2x.png</file>
         <file>images/progressbar.png</file>
         <file>images/progressbar@2x.png</file>
-        <file>images/help.png</file>
         <file>images/editclear.png</file>
         <file>images/editclear@2x.png</file>
         <file>images/arrowdown.png</file>
diff --git a/src/plugins/coreplugin/systemsettings.ui b/src/plugins/coreplugin/systemsettings.ui
index 674524e0479..4d36f3c9182 100644
--- a/src/plugins/coreplugin/systemsettings.ui
+++ b/src/plugins/coreplugin/systemsettings.ui
@@ -22,10 +22,6 @@
         <property name="text">
          <string>?</string>
         </property>
-        <property name="icon">
-         <iconset resource="../../libs/utils/utils.qrc">
-          <normaloff>:/utils/images/help.png</normaloff>:/utils/images/help.png</iconset>
-        </property>
        </widget>
       </item>
       <item row="1" column="2">
@@ -386,8 +382,6 @@
   <tabstop>warnBeforeOpeningBigFiles</tabstop>
   <tabstop>bigFilesLimitSpinBox</tabstop>
  </tabstops>
- <resources>
-  <include location="../../libs/utils/utils.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>