fanhuadesenlinnn/tdesktop
1
0
Fork 0
mirror of https://hubproxy.babadafafafafa.cn/https://github.com/telegramdesktop/tdesktop synced 2026-09-20 08:03:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Qt 6.10.1 -> 6.10.2

Browse Source
This commit is contained in:
Ilya Fedin
2026-01-29 16:46:18 +04:00
committed by John Preston
parent 1ac081d695
commit 2a3c260dd6
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/build/docker/centos_env/Dockerfile
View File

@@ -93,7 +93,7 @@ FROM builder AS patches
RUN git init patches \ RUN git init patches \
&& cd patches \ && cd patches \
&& git remote add origin https://github.com/desktop-app/patches.git \ && git remote add origin https://github.com/desktop-app/patches.git \
&& git fetch --depth=1 origin 6eee01a2c24ed9a2bd4510a5087b489ab842d00e \ && git fetch --depth=1 origin b8c3a8ffc1514861837b9213383133c63023e0de \
&& git reset --hard FETCH_HEAD \ && git reset --hard FETCH_HEAD \
&& rm -rf .git && rm -rf .git
@@ -734,7 +734,7 @@ COPY --link --from=xcb-cursor /usr/src/xcb-cursor-cache /
COPY --link --from=openssl /usr/src/openssl-cache / COPY --link --from=openssl /usr/src/openssl-cache /
COPY --link --from=xkbcommon /usr/src/xkbcommon-cache / COPY --link --from=xkbcommon /usr/src/xkbcommon-cache /
ENV QT=6.10.1 ENV QT=6.10.2
RUN git clone -b v$QT --depth=1 https://github.com/qt/qt5.git \ RUN git clone -b v$QT --depth=1 https://github.com/qt/qt5.git \
&& cd qt5 \ && cd qt5 \
&& git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools \ && git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools \

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

@@ -452,7 +452,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 6eee01a2c24ed9a2bd4510a5087b489ab842d00e git checkout b8c3a8ffc1514861837b9213383133c63023e0de
""") """)
stage('msys64', """ stage('msys64', """

2
Telegram/build/qt_version.py
View File

@@ -6,7 +6,7 @@ def resolve(arch):
elif sys.platform == 'win32': elif sys.platform == 'win32':
if arch == 'arm' or 'qt6' in sys.argv: if arch == 'arm' or 'qt6' in sys.argv:
print('Choosing Qt 6.') print('Choosing Qt 6.')
os.environ['QT'] = '6.10.1' os.environ['QT'] = '6.10.2'
else: else:
print('Choosing Qt 5.') print('Choosing Qt 5.')
os.environ['QT'] = '5.15.18' os.environ['QT'] = '5.15.18'

4
snap/snapcraft.yaml
View File

@@ -122,7 +122,7 @@ parts:
patches: patches:
source: https://github.com/desktop-app/patches.git source: https://github.com/desktop-app/patches.git
source-depth: 1 source-depth: 1
source-commit: 859556cab51d17585ff76d3db62ff1c7502bc850 source-commit: b8c3a8ffc1514861837b9213383133c63023e0de
plugin: nil plugin: nil
override-pull: | override-pull: |
craftctl default craftctl default
@@ -403,7 +403,7 @@ parts:
qt: qt:
source: https://github.com/qt/qt5.git source: https://github.com/qt/qt5.git
source-depth: 1 source-depth: 1
source-tag: v6.10.1 source-tag: v6.10.2
source-submodules: source-submodules:
- qtbase - qtbase
- qtdeclarative - qtdeclarative