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 @@ + + + images/dir.png + images/help.png + images/unknownfile.png + + 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 @@ images/clean_pane_small@2x.png images/compile_error_taskbar.png images/compile_error_taskbar@2x.png - images/dir.png images/editcopy.png images/editcopy@2x.png images/editcut.png @@ -89,12 +88,10 @@ images/splitbutton_horizontal@2x.png images/undo.png images/undo@2x.png - images/unknownfile.png images/extension.png images/extension@2x.png images/progressbar.png images/progressbar@2x.png - images/help.png images/editclear.png images/editclear@2x.png images/arrowdown.png 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 @@ ? - - - :/utils/images/help.png:/utils/images/help.png - @@ -386,8 +382,6 @@ warnBeforeOpeningBigFiles bigFilesLimitSpinBox - - - +