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

Updated Qt to 5.15.11 on Windows.

This commit is contained in:
23rd 2023-11-04 15:06:00 +03:00 committed by John Preston
parent 6def067e98
commit 0a38cf2501
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -59,7 +59,7 @@ 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.6)
endif()

20
Telegram/build/prepare/prepare.py
View File

@ -1294,23 +1294,23 @@ release:
""")
if buildQt5:
stage('qt_5_15_10', """
git clone https://github.com/qt/qt5.git qt_5_15_10
cd qt_5_15_10
stage('qt_5_15_11', """
git clone https://github.com/qt/qt5.git qt_5_15_11
cd qt_5_15_11
perl init-repository --module-subset=qtbase,qtimageformats,qtsvg
git checkout v5.15.10-lts-lgpl
git checkout v5.15.11-lts-lgpl
git submodule update qtbase qtimageformats qtsvg
depends:patches/qtbase_5.15.10/*.patch
depends:patches/qtbase_5.15.11/*.patch
cd qtbase
win:
for /r %%i in (..\\..\\patches\\qtbase_5.15.10\\*) do git apply %%i
for /r %%i in (..\\..\\patches\\qtbase_5.15.11\\*) do git apply %%i -v
cd ..
SET CONFIGURATIONS=-debug
release:
SET CONFIGURATIONS=-debug-and-release
win:
""" + removeDir("\"%LIBS_DIR%\\Qt-5.15.10\"") + """
""" + removeDir("\"%LIBS_DIR%\\Qt-5.15.11\"") + """
SET ANGLE_DIR=%LIBS_DIR%\\tg_angle
SET ANGLE_LIBS_DIR=%ANGLE_DIR%\\out
SET MOZJPEG_DIR=%LIBS_DIR%\\mozjpeg
@ -1318,7 +1318,7 @@ win:
SET OPENSSL_LIBS_DIR=%OPENSSL_DIR%\\out
SET ZLIB_LIBS_DIR=%LIBS_DIR%\\zlib
SET WEBP_DIR=%LIBS_DIR%\\libwebp
configure -prefix "%LIBS_DIR%\\Qt-5.15.10" ^
configure -prefix "%LIBS_DIR%\\Qt-5.15.11" ^
%CONFIGURATIONS% ^
-force-debug-info ^
-opensource ^
@ -1353,14 +1353,14 @@ win:
jom -j16
jom -j16 install
mac:
find ../../patches/qtbase_5.15.10 -type f -print0 | sort -z | xargs -0 git apply
find ../../patches/qtbase_5.15.11 -type f -print0 | sort -z | xargs -0 git apply
cd ..
CONFIGURATIONS=-debug
release:
CONFIGURATIONS=-debug-and-release
mac:
./configure -prefix "$USED_PREFIX/Qt-5.15.10" \
./configure -prefix "$USED_PREFIX/Qt-5.15.11" \
$CONFIGURATIONS \
-force-debug-info \
-opensource \