diff --git a/CMakeLists.txt b/CMakeLists.txt index 687b25f..0b15166 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,11 +21,14 @@ set(style_files ) set(qrc_files fonts/fonts.qrc - qt_conf/linux.qrc qt_conf/mac.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_styles(lib_ui ${src_loc} "${style_files}" ui/colors.palette) generate_emoji(lib_ui emoji_suggestions/emoji_autocomplete.json) diff --git a/ui/style/style_core_font.cpp b/ui/style/style_core_font.cpp index cfe2111..9f3aad8 100644 --- a/ui/style/style_core_font.cpp +++ b/ui/style/style_core_font.cpp @@ -20,9 +20,9 @@ void style_InitFontsResource() { Q_INIT_RESOURCE(win); #elif defined Q_OS_MAC // Q_OS_WIN 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); -#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 {