Skip to content

Commit d8e3ba8

Browse files
committed
Update Qt to 6.9.2
1 parent 0cf3325 commit d8e3ba8

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

Telegram/build/docker/centos_env/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ FROM builder AS patches
9191
RUN git init patches \
9292
&& cd patches \
9393
&& git remote add origin https://github.com/desktop-app/patches.git \
94-
&& git fetch --depth=1 origin e15b5d87c565e516aad5bcafdfe40315f84e5459 \
94+
&& git fetch --depth=1 origin a25a212644a8e42d9a5b1c7ba6489e11e92df813 \
9595
&& git reset --hard FETCH_HEAD \
9696
&& rm -rf .git
9797

@@ -730,7 +730,7 @@ COPY --link --from=xcb-cursor /usr/src/xcb-cursor-cache /
730730
COPY --link --from=openssl /usr/src/openssl-cache /
731731
COPY --link --from=xkbcommon /usr/src/xkbcommon-cache /
732732

733-
ENV QT=6.9.1
733+
ENV QT=6.9.2
734734
RUN git clone -b v$QT --depth=1 https://github.com/qt/qt5.git \
735735
&& cd qt5 \
736736
&& git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools \

Telegram/build/prepare/prepare.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ def runStages():
456456
stage('patches', """
457457
git clone https://github.com/desktop-app/patches.git
458458
cd patches
459-
git checkout 1ffcb17817a2cab167061d530703842395291e69
459+
git checkout a25a212644a8e42d9a5b1c7ba6489e11e92df813
460460
""")
461461

462462
stage('msys64', """

Telegram/build/qt_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ def resolve(arch):
66
elif sys.platform == 'win32':
77
if arch == 'arm' or 'qt6' in sys.argv:
88
print('Choosing Qt 6.')
9-
os.environ['QT'] = '6.9.1'
9+
os.environ['QT'] = '6.9.2'
1010
else:
1111
print('Choosing Qt 5.')
1212
os.environ['QT'] = '5.15.17'

snap/snapcraft.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ parts:
107107
patches:
108108
source: https://github.com/desktop-app/patches.git
109109
source-depth: 1
110-
source-commit: e15b5d87c565e516aad5bcafdfe40315f84e5459
110+
source-commit: a25a212644a8e42d9a5b1c7ba6489e11e92df813
111111
plugin: dump
112112
override-pull: |
113113
craftctl default
@@ -399,7 +399,7 @@ parts:
399399
qt:
400400
source: https://github.com/qt/qt5.git
401401
source-depth: 1
402-
source-tag: v6.9.1
402+
source-tag: v6.9.2
403403
source-submodules:
404404
- qtbase
405405
- qtdeclarative

0 commit comments

Comments
 (0)