Skip to content

Commit 3453de3

Browse files
committed
Clean cmake rules, double resource in qrc and fix path to main icon for windows (rc)
1 parent 2b2cd7a commit 3453de3

File tree

3 files changed

+2
-12
lines changed

3 files changed

+2
-12
lines changed

CMakeLists.txt

+1-4
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,15 @@ set (FORMS
6060
ui/settingsdialog.ui)
6161
set (LIB_HEADERS
6262
libs/basketpwd/basketbaseitem.h
63-
libs/basketpwd/basketpwd-libs_global.h
6463
libs/basketpwd/basketutils.h
65-
libs/basketpwd/coreplugin.h
66-
libs/basketpwd/plugin_share.h)
64+
libs/basketpwd/coreplugin.h)
6765
set (LIB_SOURCES
6866
libs/basketpwd/basketbaseitem.cpp
6967
libs/basketpwd/basketutils.cpp
7068
libs/basketpwd/coreplugin.cpp)
7169

7270
set (LANG_PATH l10n)
7371
set (LANGUAGES en)
74-
#set (RESOURCES icon-images.qrc)
7572
set (RESOURCES basketpwd.qrc icon-images.qrc)
7673
set (TRANSLATIONS_BINARY qt_ru.qm)
7774
set (DESKTOP_FILE tools/${PROJECT}.desktop)

basketpwd.qrc

-7
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@
9898
<file alias="48x48/list-remove.png">icons/classic-internal/48x48/list-remove.png</file>
9999
<file alias="48x48/format-indent-less.png">icons/classic-internal/48x48/format-indent-less.png</file>
100100
<file alias="48x48/folder-new.png">icons/classic-internal/48x48/folder-new.png</file>
101-
<file alias="48x48/basketpwd.png">icons/classic-internal/48x48/basketpwd.png</file>
102101
<file alias="48x48/code-variable.png">icons/classic-internal/48x48/code-variable.png</file>
103102
<file alias="48x48/list-add.png">icons/classic-internal/48x48/list-add.png</file>
104103
<file alias="48x48/document-properties.png">icons/classic-internal/48x48/document-properties.png</file>
@@ -117,7 +116,6 @@
117116
<file alias="32x32/list-remove.png">icons/classic-internal/32x32/list-remove.png</file>
118117
<file alias="32x32/format-indent-less.png">icons/classic-internal/32x32/format-indent-less.png</file>
119118
<file alias="32x32/folder-new.png">icons/classic-internal/32x32/folder-new.png</file>
120-
<file alias="32x32/basketpwd.png">icons/classic-internal/32x32/basketpwd.png</file>
121119
<file alias="32x32/code-variable.png">icons/classic-internal/32x32/code-variable.png</file>
122120
<file alias="32x32/list-add.png">icons/classic-internal/32x32/list-add.png</file>
123121
<file alias="32x32/document-properties.png">icons/classic-internal/32x32/document-properties.png</file>
@@ -136,7 +134,6 @@
136134
<file alias="22x22/list-remove.png">icons/classic-internal/22x22/list-remove.png</file>
137135
<file alias="22x22/format-indent-less.png">icons/classic-internal/22x22/format-indent-less.png</file>
138136
<file alias="22x22/folder-new.png">icons/classic-internal/22x22/folder-new.png</file>
139-
<file alias="22x22/basketpwd.png">icons/classic-internal/22x22/basketpwd.png</file>
140137
<file alias="22x22/code-variable.png">icons/classic-internal/22x22/code-variable.png</file>
141138
<file alias="22x22/list-add.png">icons/classic-internal/22x22/list-add.png</file>
142139
<file alias="22x22/document-properties.png">icons/classic-internal/22x22/document-properties.png</file>
@@ -155,7 +152,6 @@
155152
<file alias="16x16/list-remove.png">icons/classic-internal/16x16/list-remove.png</file>
156153
<file alias="16x16/format-indent-less.png">icons/classic-internal/16x16/format-indent-less.png</file>
157154
<file alias="16x16/folder-new.png">icons/classic-internal/16x16/folder-new.png</file>
158-
<file alias="16x16/basketpwd.png">icons/classic-internal/16x16/basketpwd.png</file>
159155
<file alias="16x16/code-variable.png">icons/classic-internal/16x16/code-variable.png</file>
160156
<file alias="16x16/list-add.png">icons/classic-internal/16x16/list-add.png</file>
161157
<file alias="16x16/document-properties.png">icons/classic-internal/16x16/document-properties.png</file>
@@ -165,9 +161,6 @@
165161
<file alias="16x16/edit-rename.png">icons/classic-internal/16x16/edit-rename.png</file>
166162
<file alias="256x256/basketpwd.png">icons/classic-internal/256x256/basketpwd.png</file>
167163
<file alias="128x128/basketpwd.png">icons/classic-internal/128x128/basketpwd.png</file>
168-
<file alias="32x32/basketpwd.png">icons/classic-internal/32x32/basketpwd.png</file>
169-
<file alias="22x22/basketpwd.png">icons/classic-internal/22x22/basketpwd.png</file>
170-
<file alias="16x16/basketpwd.png">icons/classic-internal/16x16/basketpwd.png</file>
171164
<file alias="64x64/basketpwd.png">icons/classic-internal/64x64/basketpwd.png</file>
172165
</qresource>
173166
</RCC>

basketpwd.rc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
IDI_ICON1 ICON DISCARDABLE "images/basketpwd.ico\0"
1+
IDI_ICON1 ICON DISCARDABLE "icons/basketpwd.ico\0"

0 commit comments

Comments
 (0)