From 0a38cf250150e30e58bdd36c73201786f9acb368 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Sat, 4 Nov 2023 15:06:00 +0300 Subject: [PATCH] Updated Qt to 5.15.11 on Windows. --- CMakeLists.txt | 2 +- Telegram/build/prepare/prepare.py | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 954b9476fa..738d30544e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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() diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index e14f262650..762e87cc0b 100644 --- a/Telegram/build/prepare/prepare.py +++ b/Telegram/build/prepare/prepare.py @@ -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 \