Merge tag 'v4.11.5' into dev

# Conflicts:
#	Telegram/Resources/winrc/Telegram.rc
#	Telegram/Resources/winrc/Updater.rc
#	Telegram/SourceFiles/core/version.h
#	Telegram/SourceFiles/platform/win/tray_win.cpp
#	Telegram/lib_ui
This commit is contained in:
ZavaruKitsu
2023-11-08 21:33:14 +03:00
119 changed files with 4356 additions and 1285 deletions
+2 -2
View File
@@ -59,9 +59,9 @@ include(cmake/options.cmake)
if (NOT DESKTOP_APP_USE_PACKAGED)
if (WIN32)
set(qt_version 5.15.10)
set(qt_version 5.15.11)
elseif (APPLE)
set(qt_version 6.2.5)
set(qt_version 6.2.6)
endif()
endif()
include(cmake/external/qt/package.cmake)