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

Update Qt to 5.15.13 on Windows.

This commit is contained in:
John Preston 2024-03-13 17:50:10 +04:00
parent 3e373200b1
commit 4685b889c2
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

@ -60,7 +60,7 @@ include(cmake/options.cmake)
if (NOT DESKTOP_APP_USE_PACKAGED) if (NOT DESKTOP_APP_USE_PACKAGED)
if (WIN32) if (WIN32)
set(qt_version 5.15.12) set(qt_version 5.15.13)
elseif (APPLE) elseif (APPLE)
set(qt_version 6.2.7) set(qt_version 6.2.7)
endif() endif()

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

@ -424,7 +424,7 @@ if customRunCommand:
stage('patches', """ stage('patches', """
git clone https://github.com/desktop-app/patches.git git clone https://github.com/desktop-app/patches.git
cd patches cd patches
git checkout bed08b53a3 git checkout cc0c2f8365
""") """)
stage('msys64', """ stage('msys64', """
@ -1400,21 +1400,21 @@ release:
""") """)
if buildQt5: if buildQt5:
stage('qt_5_15_12', """ stage('qt_5_15_13', """
git clone -b v5.15.12-lts-lgpl https://github.com/qt/qt5.git qt_5_15_12 git clone -b v5.15.13-lts-lgpl https://github.com/qt/qt5.git qt_5_15_13
cd qt_5_15_12 cd qt_5_15_13
perl init-repository --module-subset=qtbase,qtimageformats,qtsvg perl init-repository --module-subset=qtbase,qtimageformats,qtsvg
depends:patches/qtbase_5.15.12/*.patch depends:patches/qtbase_5.15.13/*.patch
cd qtbase cd qtbase
win: win:
for /r %%i in (..\\..\\patches\\qtbase_5.15.12\\*) do git apply %%i -v for /r %%i in (..\\..\\patches\\qtbase_5.15.13\\*) do git apply %%i -v
cd .. cd ..
SET CONFIGURATIONS=-debug SET CONFIGURATIONS=-debug
release: release:
SET CONFIGURATIONS=-debug-and-release SET CONFIGURATIONS=-debug-and-release
win: win:
""" + removeDir("\"%LIBS_DIR%\\Qt-5.15.12\"") + """ """ + removeDir("\"%LIBS_DIR%\\Qt-5.15.13\"") + """
SET ANGLE_DIR=%LIBS_DIR%\\tg_angle SET ANGLE_DIR=%LIBS_DIR%\\tg_angle
SET ANGLE_LIBS_DIR=%ANGLE_DIR%\\out SET ANGLE_LIBS_DIR=%ANGLE_DIR%\\out
SET MOZJPEG_DIR=%LIBS_DIR%\\mozjpeg SET MOZJPEG_DIR=%LIBS_DIR%\\mozjpeg
@ -1422,7 +1422,7 @@ win:
SET OPENSSL_LIBS_DIR=%OPENSSL_DIR%\\out SET OPENSSL_LIBS_DIR=%OPENSSL_DIR%\\out
SET ZLIB_LIBS_DIR=%LIBS_DIR%\\zlib SET ZLIB_LIBS_DIR=%LIBS_DIR%\\zlib
SET WEBP_DIR=%LIBS_DIR%\\libwebp SET WEBP_DIR=%LIBS_DIR%\\libwebp
configure -prefix "%LIBS_DIR%\\Qt-5.15.12" ^ configure -prefix "%LIBS_DIR%\\Qt-5.15.13" ^
%CONFIGURATIONS% ^ %CONFIGURATIONS% ^
-force-debug-info ^ -force-debug-info ^
-opensource ^ -opensource ^
@ -1457,14 +1457,14 @@ win:
jom -j16 jom -j16
jom -j16 install jom -j16 install
mac: mac:
find ../../patches/qtbase_5.15.12 -type f -print0 | sort -z | xargs -0 git apply find ../../patches/qtbase_5.15.13 -type f -print0 | sort -z | xargs -0 git apply
cd .. cd ..
CONFIGURATIONS=-debug CONFIGURATIONS=-debug
release: release:
CONFIGURATIONS=-debug-and-release CONFIGURATIONS=-debug-and-release
mac: mac:
./configure -prefix "$USED_PREFIX/Qt-5.15.12" \ ./configure -prefix "$USED_PREFIX/Qt-5.15.13" \
$CONFIGURATIONS \ $CONFIGURATIONS \
-force-debug-info \ -force-debug-info \
-opensource \ -opensource \