From 10ad238c165e744606a2e1e70b4942741a5a5b35 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Fri, 13 May 2022 00:29:38 +0200
Subject: [PATCH] Move the question mark icon into utils.qrc

Change-Id: I91eab75a89fdbf9852e92153d4edb42af8c42373
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
---
 src/libs/ssh/CMakeLists.txt                         |   1 -
 src/libs/ssh/ssh.qbs                                |   1 -
 src/libs/ssh/ssh.qrc                                |   5 -----
 src/libs/{ssh => utils}/images/help.png             | Bin
 src/libs/utils/utils.qrc                            |   1 +
 src/libs/utils/utilsicons.cpp                       |   6 ++++--
 src/libs/utils/utilsicons.h                         |   3 ++-
 .../devicesupport/devicefilesystemmodel.cpp         |   2 +-
 8 files changed, 8 insertions(+), 11 deletions(-)
 delete mode 100644 src/libs/ssh/ssh.qrc
 rename src/libs/{ssh => utils}/images/help.png (100%)

diff --git a/src/libs/ssh/CMakeLists.txt b/src/libs/ssh/CMakeLists.txt
index 6008ca9410e..87564923cf4 100644
--- a/src/libs/ssh/CMakeLists.txt
+++ b/src/libs/ssh/CMakeLists.txt
@@ -1,7 +1,6 @@
 add_qtc_library(QtcSsh
   DEPENDS Qt5::Core Qt5::Network Qt5::Widgets Utils
   SOURCES
-    ssh.qrc
     ssh_global.h
     sshparameters.cpp sshparameters.h
     sshsettings.cpp sshsettings.h
diff --git a/src/libs/ssh/ssh.qbs b/src/libs/ssh/ssh.qbs
index 21d3b8f2c94..716434774f5 100644
--- a/src/libs/ssh/ssh.qbs
+++ b/src/libs/ssh/ssh.qbs
@@ -17,7 +17,6 @@ Project {
         Depends { name: "Utils" }
 
         files: [
-            "ssh.qrc",
             "sshparameters.cpp",
             "sshparameters.h",
             "sshsettings.cpp",
diff --git a/src/libs/ssh/ssh.qrc b/src/libs/ssh/ssh.qrc
deleted file mode 100644
index 9801217093e..00000000000
--- a/src/libs/ssh/ssh.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/ssh">
-        <file>images/help.png</file>
-    </qresource>
-</RCC>
diff --git a/src/libs/ssh/images/help.png b/src/libs/utils/images/help.png
similarity index 100%
rename from src/libs/ssh/images/help.png
rename to src/libs/utils/images/help.png
diff --git a/src/libs/utils/utils.qrc b/src/libs/utils/utils.qrc
index fc5ec2adfae..8685c9be9f2 100644
--- a/src/libs/utils/utils.qrc
+++ b/src/libs/utils/utils.qrc
@@ -237,6 +237,7 @@
         <file>images/download@2x.png</file>
         <file>images/message.png</file>
         <file>images/message@2x.png</file>
+        <file>images/help.png</file>
         <file alias="mimetypes/freedesktop.org.xml" compression-algorithm="best">../3rdparty/xdg/freedesktop.org.xml</file>
     </qresource>
     <qresource prefix="/codemodel">
diff --git a/src/libs/utils/utilsicons.cpp b/src/libs/utils/utilsicons.cpp
index 8bec380a23f..abb8c5e8e1c 100644
--- a/src/libs/utils/utilsicons.cpp
+++ b/src/libs/utils/utilsicons.cpp
@@ -107,10 +107,12 @@ const Icon EXPORTFILE_TOOLBAR({
 const Icon MULTIEXPORTFILE_TOOLBAR({
         {":/utils/images/filemultiexport.png", Theme::IconsBaseColor}});
 
-const Icon UNKNOWN_FILE({
-        {":/utils/images/unknownfile.png", Theme::IconsBaseColor}});
 const Icon DIR({
         {":/utils/images/dir.png", Theme::IconsBaseColor}});
+const Icon HELP({
+        {":/utils/images/help.png", Theme::IconsBaseColor}});
+const Icon UNKNOWN_FILE({
+        {":/utils/images/unknownfile.png", Theme::IconsBaseColor}});
 
 const Icon UNDO({
         {":/utils/images/undo.png", Theme::PanelTextColorMid}}, Icon::Tint);
diff --git a/src/libs/utils/utilsicons.h b/src/libs/utils/utilsicons.h
index 9e70d8b88c0..35a739c550c 100644
--- a/src/libs/utils/utilsicons.h
+++ b/src/libs/utils/utilsicons.h
@@ -69,8 +69,9 @@ QTCREATOR_UTILS_EXPORT extern const Icon SAVEFILE_TOOLBAR;
 QTCREATOR_UTILS_EXPORT extern const Icon EXPORTFILE_TOOLBAR;
 QTCREATOR_UTILS_EXPORT extern const Icon MULTIEXPORTFILE_TOOLBAR;
 
-QTCREATOR_UTILS_EXPORT extern const Icon UNKNOWN_FILE;
 QTCREATOR_UTILS_EXPORT extern const Icon DIR;
+QTCREATOR_UTILS_EXPORT extern const Icon HELP;
+QTCREATOR_UTILS_EXPORT extern const Icon UNKNOWN_FILE;
 
 QTCREATOR_UTILS_EXPORT extern const Icon UNDO;
 QTCREATOR_UTILS_EXPORT extern const Icon UNDO_TOOLBAR;
diff --git a/src/plugins/projectexplorer/devicesupport/devicefilesystemmodel.cpp b/src/plugins/projectexplorer/devicesupport/devicefilesystemmodel.cpp
index 51358c269cc..3fa987f2b0a 100644
--- a/src/plugins/projectexplorer/devicesupport/devicefilesystemmodel.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicefilesystemmodel.cpp
@@ -176,7 +176,7 @@ QVariant DeviceFileSystemModel::data(const QModelIndex &index, int role) const
             return Utils::Icons::UNKNOWN_FILE.icon();
         if (node->m_fileType == FileType::Dir)
             return Utils::Icons::DIR.icon();
-        return QIcon(":/ssh/images/help.png"); // Shows a question mark.
+        return Utils::Icons::HELP.icon(); // Shows a question mark.
     }
     if (index.column() == 1) {
         if (role == Qt::DisplayRole) {