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

Updated Qt to 5.15.8 on Windows.

Browse Source
This commit is contained in:
23rd 2023-01-06 08:50:06 +03:00 committed by John Preston
parent 08fa6a9815
commit 0f538e2606
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

@ -56,7 +56,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.7) set(qt_version 5.15.8)
elseif (APPLE) elseif (APPLE)
set(qt_version 6.3.2) set(qt_version 6.3.2)
else() else()

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

@ -404,7 +404,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 9e04e2eb9c git checkout 8a361a1307
""") """)
stage('msys64', """ stage('msys64', """
@ -1210,30 +1210,30 @@ release:
""") """)
if buildQt5: if buildQt5:
stage('qt_5_15_7', """ stage('qt_5_15_8', """
git clone https://code.qt.io/qt/qt5.git qt_5_15_7 git clone https://code.qt.io/qt/qt5.git qt_5_15_8
cd qt_5_15_7 cd qt_5_15_8
perl init-repository --module-subset=qtbase,qtimageformats,qtsvg perl init-repository --module-subset=qtbase,qtimageformats,qtsvg
git checkout v5.15.7-lts-lgpl git checkout v5.15.8-lts-lgpl
git submodule update qtbase qtimageformats qtsvg git submodule update qtbase qtimageformats qtsvg
depends:patches/qtbase_5_15_7/*.patch depends:patches/qtbase_5_15_8/*.patch
cd qtbase cd qtbase
win: win:
for /r %%i in (..\\..\\patches\\qtbase_5_15_7\\*) do git apply %%i for /r %%i in (..\\..\\patches\\qtbase_5_15_8\\*) do git apply %%i
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.7\"") + """ """ + removeDir("\"%LIBS_DIR%\\Qt-5.15.8\"") + """
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
SET OPENSSL_DIR=%LIBS_DIR%\\openssl SET OPENSSL_DIR=%LIBS_DIR%\\openssl
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
configure -prefix "%LIBS_DIR%\\Qt-5.15.7" ^ configure -prefix "%LIBS_DIR%\\Qt-5.15.8" ^
%CONFIGURATIONS% ^ %CONFIGURATIONS% ^
-force-debug-info ^ -force-debug-info ^
-opensource ^ -opensource ^
@ -1264,14 +1264,14 @@ win:
jom -j16 jom -j16
jom -j16 install jom -j16 install
mac: mac:
find ../../patches/qtbase_5_15_7 -type f -print0 | sort -z | xargs -0 git apply find ../../patches/qtbase_5_15_8 -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.7" \ ./configure -prefix "$USED_PREFIX/Qt-5.15.8" \
$CONFIGURATIONS \ $CONFIGURATIONS \
-force-debug-info \ -force-debug-info \
-opensource \ -opensource \