kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Don't load linux.qrc when DESKTOP_APP_USE_PACKAGED is defined

Browse source
This commit is contained in:
Ilya Fedin 2020-01-17 15:53:58 +04:00 • committed by John Preston
parent 20b37f2dc1
commit 777cf61626
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -21,11 +21,14 @@ set(style_files
) )
set(qrc_files set(qrc_files
fonts/fonts.qrc fonts/fonts.qrc
qt_conf/linux.qrc
qt_conf/mac.qrc qt_conf/mac.qrc
qt_conf/win.qrc qt_conf/win.qrc
) )
if (NOT DESKTOP_APP_USE_PACKAGED)
set(qrc_files qt_conf/linux.qrc)
endif()
generate_palette(lib_ui ui/colors.palette) generate_palette(lib_ui ui/colors.palette)
generate_styles(lib_ui ${src_loc} "${style_files}" ui/colors.palette) generate_styles(lib_ui ${src_loc} "${style_files}" ui/colors.palette)
generate_emoji(lib_ui emoji_suggestions/emoji_autocomplete.json) generate_emoji(lib_ui emoji_suggestions/emoji_autocomplete.json)

4
ui/style/style_core_font.cpp
View file

@ -20,9 +20,9 @@ void style_InitFontsResource() {
Q_INIT_RESOURCE(win); Q_INIT_RESOURCE(win);
#elif defined Q_OS_MAC // Q_OS_WIN #elif defined Q_OS_MAC // Q_OS_WIN
Q_INIT_RESOURCE(mac); Q_INIT_RESOURCE(mac);
#else // Q_OS_WIN || Q_OS_MAC #elif defined Q_OS_LINUX && !defined DESKTOP_APP_USE_PACKAGED // Q_OS_WIN || Q_OS_MAC
Q_INIT_RESOURCE(linux); Q_INIT_RESOURCE(linux);
#endif // Q_OS_WIN || Q_OS_MAC || Q_OS_LINUX #endif // Q_OS_WIN || Q_OS_MAC || (Q_OS_LINUX && !DESKTOP_APP_USE_PACKAGED)
} }
namespace style { namespace style {