feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Move the question mark icon into utils.qrc

Browse Source 
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>
This commit is contained in:
Jarek Kobus
2022-05-13 00:29:38 +02:00
parent bf4b94e4b8
commit 10ad238c16
8 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libs/ssh/CMakeLists.txt
View File

@@ -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

1
src/libs/ssh/ssh.qbs
View File

@@ -17,7 +17,6 @@ Project {
Depends { name: "Utils" }
files: [
"ssh.qrc",
"sshparameters.cpp",
"sshparameters.h",
"sshsettings.cpp",

5
src/libs/ssh/ssh.qrc
View File

@@ -1,5 +0,0 @@
<RCC>
<qresource prefix="/ssh">
<file>images/help.png</file>
</qresource>
</RCC>

0
src/libs/ssh/images/help.png → src/libs/utils/images/help.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 430 B

After

Width:  |  Height:  |  Size: 430 B

1
src/libs/utils/utils.qrc
View File

@@ -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">

6
src/libs/utils/utilsicons.cpp
View File

@@ -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);

3
src/libs/utils/utilsicons.h
View File

@@ -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;

2
src/plugins/projectexplorer/devicesupport/devicefilesystemmodel.cpp
View File

@@ -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) {