Skip to content

Commit e3c4d49

Browse files
ilya-fedinjohn-preston
authored andcommitted
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
1 parent 5cf6981 commit e3c4d49

File tree

5 files changed

+1
-15
lines changed

5 files changed

+1
-15
lines changed

CMakeLists.txt

-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ PRIVATE
3434
ui/colors.palette
3535
emoji_suggestions/emoji_autocomplete.json
3636

37-
qt_conf/mac.qrc
3837
qt_conf/win.qrc
3938

4039
ui/effects/animation_value.cpp
@@ -245,8 +244,6 @@ PRIVATE
245244

246245
if (DESKTOP_APP_USE_PACKAGED)
247246
nice_target_sources(lib_ui ${src_loc} PRIVATE ui/text/qtextitemint.cpp)
248-
else()
249-
nice_target_sources(lib_ui ${src_loc} PRIVATE qt_conf/linux.qrc)
250247
endif()
251248

252249
if (NOT DESKTOP_APP_USE_PACKAGED_FONTS)

qt_conf/linux.qrc

-5
This file was deleted.

qt_conf/mac.qrc

-2
This file was deleted.

qt_conf/qt_linux.conf

-2
This file was deleted.

ui/style/style_core_font.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ void style_InitFontsResource() {
3030
#endif // !DESKTOP_APP_USE_PACKAGED_FONTS
3131
#ifdef Q_OS_WIN
3232
Q_INIT_RESOURCE(win);
33-
#elif defined Q_OS_UNIX && !defined DESKTOP_APP_USE_PACKAGED // Q_OS_WIN
34-
Q_INIT_RESOURCE(linux);
35-
#endif // Q_OS_WIN || (Q_OS_UNIX && !DESKTOP_APP_USE_PACKAGED)
33+
#endif // Q_OS_WIN
3634

3735
#endif // Q_OS_MAC
3836
}

0 commit comments

Comments
 (0)