From e3c4d49912277379ed9ba6f300a5155b39337cb1 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 4 Dec 2021 06:23:15 +0400
Subject: [PATCH] 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
---
 CMakeLists.txt               | 3 ---
 qt_conf/linux.qrc            | 5 -----
 qt_conf/mac.qrc              | 2 --
 qt_conf/qt_linux.conf        | 2 --
 ui/style/style_core_font.cpp | 4 +---
 5 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 qt_conf/linux.qrc
 delete mode 100644 qt_conf/mac.qrc
 delete mode 100644 qt_conf/qt_linux.conf

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed89e80..c4970a7 100644
--- 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
deleted file mode 100644
index b84b2cc..0000000
--- a/qt_conf/linux.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<RCC>
-  <qresource prefix="/qt/etc">
-    <file alias="qt.conf">qt_linux.conf</file>
-  </qresource>
-</RCC>
diff --git a/qt_conf/mac.qrc b/qt_conf/mac.qrc
deleted file mode 100644
index 03585ec..0000000
--- a/qt_conf/mac.qrc
+++ /dev/null
@@ -1,2 +0,0 @@
-<RCC>
-</RCC>
diff --git a/qt_conf/qt_linux.conf b/qt_conf/qt_linux.conf
deleted file mode 100644
index 6d80862..0000000
--- a/qt_conf/qt_linux.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[Paths]
-Libraries=:/gui/art
diff --git a/ui/style/style_core_font.cpp b/ui/style/style_core_font.cpp
index 7d2c3ef..3df73c8 100644
--- 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
 }