MrBesen
/
tdesktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated Qt to 5.15.10 on Windows.

This commit is contained in:
23rd 2023-06-07 16:58:09 +03:00 committed by John Preston
parent c765c4198f
commit e8e74e7ac7
2 changed files with 12 additions and 12 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.9)
set(qt_version 5.15.10)
elseif (APPLE)
set(qt_version 6.3.2)
endif()

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

@ -404,7 +404,7 @@ if customRunCommand:
stage('patches', """
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout 3fad86d684
git checkout b9361e74b2
""")
stage('msys64', """
@ -1234,30 +1234,30 @@ release:
""")
if buildQt5:
stage('qt_5_15_9', """
git clone https://github.com/qt/qt5.git qt_5_15_9
cd qt_5_15_9
stage('qt_5_15_10', """
git clone https://github.com/qt/qt5.git qt_5_15_10
cd qt_5_15_10
perl init-repository --module-subset=qtbase,qtimageformats,qtsvg
git checkout v5.15.9-lts-lgpl
git checkout v5.15.10-lts-lgpl
git submodule update qtbase qtimageformats qtsvg
depends:patches/qtbase_5.15.9/*.patch
depends:patches/qtbase_5.15.10/*.patch
cd qtbase
win:
for /r %%i in (..\\..\\patches\\qtbase_5.15.9\\*) do git apply %%i
for /r %%i in (..\\..\\patches\\qtbase_5.15.10\\*) do git apply %%i
cd ..
SET CONFIGURATIONS=-debug
release:
SET CONFIGURATIONS=-debug-and-release
win:
""" + removeDir("\"%LIBS_DIR%\\Qt-5.15.9\"") + """
""" + removeDir("\"%LIBS_DIR%\\Qt-5.15.10\"") + """
SET ANGLE_DIR=%LIBS_DIR%\\tg_angle
SET ANGLE_LIBS_DIR=%ANGLE_DIR%\\out
SET MOZJPEG_DIR=%LIBS_DIR%\\mozjpeg
SET OPENSSL_DIR=%LIBS_DIR%\\openssl
SET OPENSSL_LIBS_DIR=%OPENSSL_DIR%\\out
SET ZLIB_LIBS_DIR=%LIBS_DIR%\\zlib
configure -prefix "%LIBS_DIR%\\Qt-5.15.9" ^
configure -prefix "%LIBS_DIR%\\Qt-5.15.10" ^
%CONFIGURATIONS% ^
-force-debug-info ^
-opensource ^
@ -1289,14 +1289,14 @@ win:
jom -j16
jom -j16 install
mac:
find ../../patches/qtbase_5.15.9 -type f -print0 | sort -z | xargs -0 git apply
find ../../patches/qtbase_5.15.10 -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.9" \
./configure -prefix "$USED_PREFIX/Qt-5.15.10" \
$CONFIGURATIONS \
-force-debug-info \
-opensource \