File tree 4 files changed +17
-5
lines changed
4 files changed +17
-5
lines changed Original file line number Diff line number Diff line change @@ -51,7 +51,12 @@ if (WIN32)
51
51
endif ()
52
52
53
53
set_target_properties (Telegram PROPERTIES AUTOMOC ON )
54
- target_prepare_qrc(Telegram)
54
+ if (LINUX)
55
+ # Do not repeat app name in path of a resource archive.
56
+ target_prepare_qrc(Telegram tresources.rcc)
57
+ else ()
58
+ target_prepare_qrc(Telegram)
59
+ endif ()
55
60
56
61
target_link_libraries (Telegram
57
62
PRIVATE
@@ -1536,7 +1541,11 @@ if (LINUX AND DESKTOP_APP_USE_PACKAGED)
1536
1541
include (GNUInstallDirs)
1537
1542
configure_file ("../lib/xdg/telegramdesktop.metainfo.xml.in" "${CMAKE_CURRENT_BINARY_DIR} /telegramdesktop.metainfo.xml" @ONLY)
1538
1543
generate_appdata_changelog(Telegram "${CMAKE_SOURCE_DIR} /changelog.txt" "${CMAKE_CURRENT_BINARY_DIR} /telegramdesktop.metainfo.xml" )
1539
- install (TARGETS Telegram RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR} " BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR} " )
1544
+ install (TARGETS Telegram
1545
+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR} "
1546
+ BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR} "
1547
+ RESOURCE DESTINATION "${CMAKE_INSTALL_DATADIR} /TelegramDesktop"
1548
+ )
1540
1549
install (FILES "Resources/art/icon16.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR} /icons/hicolor/16x16/apps" RENAME "telegram.png" )
1541
1550
install (FILES "Resources/art/icon32.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR} /icons/hicolor/32x32/apps" RENAME "telegram.png" )
1542
1551
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 @@ -293,11 +293,11 @@ rpl::producer<bool> Session::termsLockValue() const {
293
293
}
294
294
295
295
QString Session::createInternalLink (const QString &query) const {
296
- return createInternalLink ({ .text = query }).text ;
296
+ return createInternalLink (TextWithEntities { .text = query }).text ;
297
297
}
298
298
299
299
QString Session::createInternalLinkFull (const QString &query) const {
300
- return createInternalLinkFull ({ .text = query }).text ;
300
+ return createInternalLinkFull (TextWithEntities { .text = query }).text ;
301
301
}
302
302
303
303
TextWithEntities Session::createInternalLink (
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"
@@ -82,6 +83,8 @@ void Launcher::initHook() {
82
83
83
84
return qsl (QT_STRINGIFY (TDESKTOP_LAUNCHER_BASENAME) " .desktop" );
84
85
}());
86
+
87
+ base::RegisterResourceArchive (u" tresources.rcc" _q);
85
88
}
86
89
87
90
bool Launcher::launchUpdater (UpdaterLaunch action) {
Original file line number Diff line number Diff line change 27
27
// macOS Retina display support is working fine, others are not.
28
28
QCoreApplication::setAttribute (Qt::AA_DisableHighDpiScaling, false );
29
29
30
- base::RegisterBundledResources (u" Telegram.rcc" _q);
30
+ base::RegisterResourceArchive (u" Telegram.rcc" _q);
31
31
}
32
32
33
33
bool Launcher::launchUpdater (UpdaterLaunch action) {
You can’t perform that action at this time.
0 commit comments