RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use Qt resources from a file on macOS.

This commit is contained in:
John Preston 2021-10-27 20:40:21 +04:00
parent 5276e5b4ae
commit 1ed6844247
6 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -39,6 +39,7 @@ include(cmake/init_target.cmake)
include(cmake/generate_target.cmake)
include(cmake/nuget.cmake)
include(cmake/validate_d3d_compiler.cmake)
include(cmake/target_prepare_qrc.cmake)
include(cmake/options.cmake)

8
Telegram/CMakeLists.txt
View File

@ -50,7 +50,8 @@ if (WIN32)
nuget_add_winrt(Telegram)
endif()
set_target_properties(Telegram PROPERTIES AUTOMOC ON AUTORCC ON)
set_target_properties(Telegram PROPERTIES AUTOMOC ON)
target_prepare_qrc(Telegram)
target_link_libraries(Telegram
PRIVATE
@ -1249,8 +1250,7 @@ elseif (APPLE)
endif()
set(icons_path ${CMAKE_CURRENT_SOURCE_DIR}/Telegram/Images.xcassets)
set_target_properties(Telegram PROPERTIES RESOURCE ${icons_path})
target_sources(Telegram PRIVATE ${icons_path})
target_add_resource(Telegram ${icons_path})
set(lang_packs
en
@ -1276,6 +1276,8 @@ elseif (APPLE)
PRE_LINK
COMMAND mkdir -p $<TARGET_FILE_DIR:Telegram>/../Frameworks
COMMAND cp $<TARGET_FILE:Updater> $<TARGET_FILE_DIR:Telegram>/../Frameworks/
COMMAND mkdir -p $<TARGET_FILE_DIR:Telegram>/../Resources
COMMAND cp ${CMAKE_BINARY_DIR}/lib_ui.rcc $<TARGET_FILE_DIR:Telegram>/../Resources
)
if (NOT DESKTOP_APP_DISABLE_CRASH_REPORTS)
add_custom_command(TARGET Telegram

3
Telegram/SourceFiles/core/sandbox.cpp
View File

@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "core/sandbox.h"
#include "base/platform/base_platform_info.h"
#include "base/base_file_utilities.h"
#include "platform/platform_specific.h"
#include "mainwidget.h"
#include "mainwindow.h"
@ -93,6 +94,8 @@ Sandbox::Sandbox(
}
int Sandbox::start() {
base::RegisterBundledResources(u"Telegram.rcc"_q);
if (!Core::UpdaterDisabled()) {
_updateChecker = std::make_unique<Core::UpdateChecker>();
}

2
Telegram/lib_base

@ -1 +1 @@
Subproject commit e7c6100ad8cfee911bdc850b5a5ccb19fb8a9122
Subproject commit 60ec2972a808225458946d044900559556218ca6

2
Telegram/lib_ui

@ -1 +1 @@
Subproject commit efdb990d96b7cb5d962a5aa76bccd4e41aa145b0
Subproject commit f51ff6b5131b64b31ad9f84e359517687a35a3f3

2
cmake

@ -1 +1 @@
Subproject commit 16224afddd0fef0cd226a531582f5dda108aa9d4
Subproject commit faf815fee0da46e8df09cd81cbfaa7bc30f842aa