File tree 3 files changed +14
-4
lines changed
3 files changed +14
-4
lines changed Original file line number Diff line number Diff line change @@ -48,7 +48,12 @@ if (WIN32)
48
48
endif ()
49
49
50
50
set_target_properties (Telegram PROPERTIES AUTOMOC ON )
51
- target_prepare_qrc(Telegram)
51
+ if (LINUX)
52
+ # Do not repeat app name in path of a resource archive.
53
+ target_prepare_qrc(Telegram tresources.rcc)
54
+ else ()
55
+ target_prepare_qrc(Telegram)
56
+ endif ()
52
57
53
58
target_link_libraries (Telegram
54
59
PRIVATE
@@ -1657,7 +1662,11 @@ if (LINUX AND DESKTOP_APP_USE_PACKAGED)
1657
1662
include (GNUInstallDirs)
1658
1663
configure_file ("../lib/xdg/telegramdesktop.metainfo.xml.in" "${CMAKE_CURRENT_BINARY_DIR} /telegramdesktop.metainfo.xml" @ONLY)
1659
1664
generate_appdata_changelog(Telegram "${CMAKE_SOURCE_DIR} /changelog.txt" "${CMAKE_CURRENT_BINARY_DIR} /telegramdesktop.metainfo.xml" )
1660
- install (TARGETS Telegram RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR} " BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR} " )
1665
+ install (TARGETS Telegram
1666
+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR} "
1667
+ BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR} "
1668
+ RESOURCE DESTINATION "${CMAKE_INSTALL_DATADIR} /TelegramDesktop"
1669
+ )
1661
1670
install (FILES "Resources/art/icon16.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR} /icons/hicolor/16x16/apps" RENAME "telegram.png" )
1662
1671
install (FILES "Resources/art/icon32.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR} /icons/hicolor/32x32/apps" RENAME "telegram.png" )
1663
1672
install (FILES "Resources/art/icon48.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR} /icons/hicolor/48x48/apps" RENAME "telegram.png" )
Original file line number Diff line number Diff line change @@ -7,6 +7,7 @@ For license and copyright information please follow this link:
7
7
*/
8
8
#include " platform/linux/launcher_linux.h"
9
9
10
+ #include " base/base_file_utilities.h"
10
11
#include " core/crash_reports.h"
11
12
#include " core/update_checker.h"
12
13
#include " webview/platform/linux/webview_linux_webkit2gtk.h"
@@ -64,6 +65,7 @@ int Launcher::exec() {
64
65
65
66
void Launcher::initHook () {
66
67
QApplication::setAttribute (Qt::AA_DisableSessionManager, true );
68
+ base::RegisterResourceArchive (u" tresources.rcc" _q);
67
69
}
68
70
69
71
bool Launcher::launchUpdater (UpdaterLaunch action) {
Original file line number Diff line number Diff line change 26
26
void Launcher::initHook () {
27
27
// macOS Retina display support is working fine, others are not.
28
28
QCoreApplication::setAttribute (Qt::AA_DisableHighDpiScaling, false );
29
-
30
- base::RegisterBundledResources (u" Telegram.rcc" _q);
29
+ base::RegisterResourceArchive (u" Telegram.rcc" _q);
31
30
}
32
31
33
32
bool Launcher::launchUpdater (UpdaterLaunch action) {
You can’t perform that action at this time.
0 commit comments