Remove legacy QRC files

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
desktop-app · Dec 6, 2021 · e3c4d49 · e3c4d49
1 parent 5cf6981
commit e3c4d49
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -34,7 +34,6 @@ PRIVATE
     ui/colors.palette
     emoji_suggestions/emoji_autocomplete.json
 
-    qt_conf/mac.qrc
     qt_conf/win.qrc
 
     ui/effects/animation_value.cpp
@@ -245,8 +244,6 @@ PRIVATE
 
 if (DESKTOP_APP_USE_PACKAGED)
     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()
 
 if (NOT DESKTOP_APP_USE_PACKAGED_FONTS)

diff --git a/qt_conf/linux.qrc b/qt_conf/linux.qrc
diff --git a/qt_conf/mac.qrc b/qt_conf/mac.qrc
diff --git a/qt_conf/qt_linux.conf b/qt_conf/qt_linux.conf
diff --git a/ui/style/style_core_font.cpp b/ui/style/style_core_font.cpp
@@ -30,9 +30,7 @@ void style_InitFontsResource() {
 #endif // !DESKTOP_APP_USE_PACKAGED_FONTS
 #ifdef Q_OS_WIN
 	Q_INIT_RESOURCE(win);
-#elif defined Q_OS_UNIX && !defined DESKTOP_APP_USE_PACKAGED // Q_OS_WIN
-	Q_INIT_RESOURCE(linux);
-#endif // Q_OS_WIN || (Q_OS_UNIX && !DESKTOP_APP_USE_PACKAGED)
+#endif // Q_OS_WIN
 
 #endif // Q_OS_MAC
 }