Qt 6.10.2 -> 6.11.0-rc1

This commit is contained in:
Ilya Fedin
2026-03-04 09:35:25 +00:00
committed by John Preston
parent b84345c083
commit f68db94c81
4 changed files with 8 additions and 8 deletions

View File

@@ -93,7 +93,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 bfbc264ea8a9b39405f2f0ec549481bbd39d1b91 \
&& git fetch --depth=1 origin 4519c85c924b9da81f29d4aac045886f896ee479 \
&& git reset --hard FETCH_HEAD \
&& rm -rf .git
@@ -737,8 +737,8 @@ 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.10.2
RUN git clone -b v$QT --depth=1 https://github.com/qt/qt5.git \
ENV QT=6.11.0
RUN git clone -b v$QT-rc1 --depth=1 https://github.com/qt/qt5.git \
&& cd qt5 \
&& git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools \
&& cd qtbase \

View File

@@ -452,7 +452,7 @@ if customRunCommand:
stage('patches', """
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout bfbc264ea8a9b39405f2f0ec549481bbd39d1b91
git checkout 4519c85c924b9da81f29d4aac045886f896ee479
""")
stage('msys64', """
@@ -1580,7 +1580,7 @@ mac:
make install
""")
else: # qt > '6'
branch = 'v$QT' + ('-lts-lgpl' if qt.startswith('6.2.') else '')
branch = 'v$QT' + ('-lts-lgpl' if qt.startswith('6.2.') else '-rc1')
stage('qt_' + qt, """
git clone -b """ + branch + """ https://github.com/qt/qt5.git qt_$QT
cd qt_$QT

View File

@@ -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.10.2'
os.environ['QT'] = '6.11.0'
else:
print('Choosing Qt 5.')
os.environ['QT'] = '5.15.18'

View File

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