2
0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-22 10:17:10 +00:00

Updated Qt to 5.15.17 on Windows.

This commit is contained in:
23rd 2025-05-27 15:31:39 +03:00
parent ab6375ef2a
commit 44fd323cb5
2 changed files with 2 additions and 3 deletions

View File

@ -456,7 +456,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 7119a74e3f git checkout f20de2b2c7a758736fa6b5f4b813de533a31ffed
""") """)
stage('msys64', """ stage('msys64', """
@ -1557,7 +1557,6 @@ release:
depends:patches/qtbase_""" + qt + """/*.patch depends:patches/qtbase_""" + qt + """/*.patch
cd qtbase cd qtbase
win: win:
git revert --no-edit 6ad56dce34
setlocal enabledelayedexpansion setlocal enabledelayedexpansion
for /r %%i in (..\\..\\patches\\qtbase_%QT%\\*) do ( for /r %%i in (..\\..\\patches\\qtbase_%QT%\\*) do (
git apply %%i -v git apply %%i -v

View File

@ -9,5 +9,5 @@ def resolve(arch):
os.environ['QT'] = '6.9.0' os.environ['QT'] = '6.9.0'
else: else:
print('Choosing Qt 5.') print('Choosing Qt 5.')
os.environ['QT'] = '5.15.15' os.environ['QT'] = '5.15.17'
return True return True