diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index 2cfb5eca1978d8..99acd8b70c3682 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -51,7 +51,12 @@ if (WIN32) endif() set_target_properties(Telegram PROPERTIES AUTOMOC ON) -target_prepare_qrc(Telegram) +if (LINUX) + # Do not repeat app name in path of a resource archive. + target_prepare_qrc(Telegram tresources.rcc) +else() + target_prepare_qrc(Telegram) +endif() target_link_libraries(Telegram PRIVATE @@ -1528,7 +1533,11 @@ if (LINUX AND DESKTOP_APP_USE_PACKAGED) include(GNUInstallDirs) configure_file("../lib/xdg/telegramdesktop.metainfo.xml.in" "${CMAKE_CURRENT_BINARY_DIR}/telegramdesktop.metainfo.xml" @ONLY) generate_appdata_changelog(Telegram "${CMAKE_SOURCE_DIR}/changelog.txt" "${CMAKE_CURRENT_BINARY_DIR}/telegramdesktop.metainfo.xml") - install(TARGETS Telegram RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}") + install(TARGETS Telegram + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}" + RESOURCE DESTINATION "${CMAKE_INSTALL_DATADIR}/TelegramDesktop" + ) install(FILES "Resources/art/icon16.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/16x16/apps" RENAME "telegram.png") install(FILES "Resources/art/icon32.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/32x32/apps" RENAME "telegram.png") install(FILES "Resources/art/icon48.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps" RENAME "telegram.png") diff --git a/Telegram/SourceFiles/platform/linux/launcher_linux.cpp b/Telegram/SourceFiles/platform/linux/launcher_linux.cpp index 931cbccd1a7cc3..f00eea3a4d9054 100644 --- a/Telegram/SourceFiles/platform/linux/launcher_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/launcher_linux.cpp @@ -7,6 +7,7 @@ For license and copyright information please follow this link: */ #include "platform/linux/launcher_linux.h" +#include "base/base_file_utilities.h" #include "core/crash_reports.h" #include "core/update_checker.h" #include "webview/platform/linux/webview_linux_webkit2gtk.h" @@ -82,6 +83,8 @@ void Launcher::initHook() { return qsl(QT_STRINGIFY(TDESKTOP_LAUNCHER_BASENAME) ".desktop"); }()); + + base::RegisterResourceArchive(u"tresources.rcc"_q); } bool Launcher::launchUpdater(UpdaterLaunch action) { diff --git a/Telegram/SourceFiles/platform/mac/launcher_mac.mm b/Telegram/SourceFiles/platform/mac/launcher_mac.mm index 95d15a8eff5863..2532e186f2c3c8 100644 --- a/Telegram/SourceFiles/platform/mac/launcher_mac.mm +++ b/Telegram/SourceFiles/platform/mac/launcher_mac.mm @@ -27,7 +27,7 @@ // macOS Retina display support is working fine, others are not. QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling, false); - base::RegisterBundledResources(u"Telegram.rcc"_q); + base::RegisterResourceArchive(u"Telegram.rcc"_q); } bool Launcher::launchUpdater(UpdaterLaunch action) {