mirror of
https://hubproxy.babadafafafafa.cn/https://github.com/telegramdesktop/tdesktop
synced 2026-09-20 08:03:45 +08:00
Update Qt to 6.9.2
This commit is contained in:
@@ -91,7 +91,7 @@ FROM builder AS patches
|
||||
RUN git init patches \
|
||||
&& cd patches \
|
||||
&& git remote add origin https://github.com/desktop-app/patches.git \
|
||||
&& git fetch --depth=1 origin e15b5d87c565e516aad5bcafdfe40315f84e5459 \
|
||||
&& git fetch --depth=1 origin a25a212644a8e42d9a5b1c7ba6489e11e92df813 \
|
||||
&& git reset --hard FETCH_HEAD \
|
||||
&& rm -rf .git
|
||||
|
||||
@@ -730,7 +730,7 @@ COPY --link --from=xcb-cursor /usr/src/xcb-cursor-cache /
|
||||
COPY --link --from=openssl /usr/src/openssl-cache /
|
||||
COPY --link --from=xkbcommon /usr/src/xkbcommon-cache /
|
||||
|
||||
ENV QT=6.9.1
|
||||
ENV QT=6.9.2
|
||||
RUN git clone -b v$QT --depth=1 https://github.com/qt/qt5.git \
|
||||
&& cd qt5 \
|
||||
&& git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools \
|
||||
|
||||
@@ -456,7 +456,7 @@ if customRunCommand:
|
||||
stage('patches', """
|
||||
git clone https://github.com/desktop-app/patches.git
|
||||
cd patches
|
||||
git checkout 1ffcb17817a2cab167061d530703842395291e69
|
||||
git checkout a25a212644a8e42d9a5b1c7ba6489e11e92df813
|
||||
""")
|
||||
|
||||
stage('msys64', """
|
||||
|
||||
@@ -6,7 +6,7 @@ def resolve(arch):
|
||||
elif sys.platform == 'win32':
|
||||
if arch == 'arm' or 'qt6' in sys.argv:
|
||||
print('Choosing Qt 6.')
|
||||
os.environ['QT'] = '6.9.1'
|
||||
os.environ['QT'] = '6.9.2'
|
||||
else:
|
||||
print('Choosing Qt 5.')
|
||||
os.environ['QT'] = '5.15.17'
|
||||
|
||||
@@ -107,7 +107,7 @@ parts:
|
||||
patches:
|
||||
source: https://github.com/desktop-app/patches.git
|
||||
source-depth: 1
|
||||
source-commit: e15b5d87c565e516aad5bcafdfe40315f84e5459
|
||||
source-commit: a25a212644a8e42d9a5b1c7ba6489e11e92df813
|
||||
plugin: nil
|
||||
override-pull: |
|
||||
craftctl default
|
||||
@@ -398,7 +398,7 @@ parts:
|
||||
qt:
|
||||
source: https://github.com/qt/qt5.git
|
||||
source-depth: 1
|
||||
source-tag: v6.9.1
|
||||
source-tag: v6.9.2
|
||||
source-submodules:
|
||||
- qtbase
|
||||
- qtdeclarative
|
||||
|
||||
Reference in New Issue
Block a user