kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Remove legacy QRC files

Browse source 
qt_linux.conf has no visible effect for a long time and mac.qrc is empty, so remove them to get rid of unneeded rcc invocations
This commit is contained in:
Ilya Fedin 2021-12-04 06:23:15 +04:00 • committed by John Preston
parent 5cf6981bbb
commit e3c4d49912
5 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -34,7 +34,6 @@ PRIVATE
ui/colors.palette ui/colors.palette
emoji_suggestions/emoji_autocomplete.json emoji_suggestions/emoji_autocomplete.json
qt_conf/mac.qrc
qt_conf/win.qrc qt_conf/win.qrc
ui/effects/animation_value.cpp ui/effects/animation_value.cpp
@ -245,8 +244,6 @@ PRIVATE
if (DESKTOP_APP_USE_PACKAGED) if (DESKTOP_APP_USE_PACKAGED)
nice_target_sources(lib_ui ${src_loc} PRIVATE ui/text/qtextitemint.cpp) nice_target_sources(lib_ui ${src_loc} PRIVATE ui/text/qtextitemint.cpp)
else()
nice_target_sources(lib_ui ${src_loc} PRIVATE qt_conf/linux.qrc)
endif() endif()
if (NOT DESKTOP_APP_USE_PACKAGED_FONTS) if (NOT DESKTOP_APP_USE_PACKAGED_FONTS)

5
qt_conf/linux.qrc
View file

@ -1,5 +0,0 @@
<RCC>
<qresource prefix="/qt/etc">
<file alias="qt.conf">qt_linux.conf</file>
</qresource>
</RCC>

2
qt_conf/mac.qrc
View file

@ -1,2 +0,0 @@
<RCC>
</RCC>

2
qt_conf/qt_linux.conf
View file

@ -1,2 +0,0 @@
[Paths]
Libraries=:/gui/art

4
ui/style/style_core_font.cpp
View file

@ -30,9 +30,7 @@ void style_InitFontsResource() {
#endif // !DESKTOP_APP_USE_PACKAGED_FONTS #endif // !DESKTOP_APP_USE_PACKAGED_FONTS
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
Q_INIT_RESOURCE(win); Q_INIT_RESOURCE(win);
#elif defined Q_OS_UNIX && !defined DESKTOP_APP_USE_PACKAGED // Q_OS_WIN #endif // Q_OS_WIN
Q_INIT_RESOURCE(linux);
#endif // Q_OS_WIN || (Q_OS_UNIX && !DESKTOP_APP_USE_PACKAGED)
#endif // Q_OS_MAC #endif // Q_OS_MAC
} }