Update submodules and patches, Qt to 6.11.2.

This commit is contained in:
John Preston
2026-09-04 10:45:46 +04:00
parent 9fbaa8942a
commit 5143200db7
7 changed files with 11 additions and 11 deletions

View File

@@ -160,7 +160,7 @@ RUN <<EOF
git init patches
cd patches
git remote add origin https://github.com/desktop-app/patches.git
git fetch --depth=1 origin 73a88cdaa13995c8666c956b80e2129ee9b6b34d
git fetch --depth=1 origin c2cc44fca4a8d0e20d1ef0f40884d717c750f0a4
git reset --hard FETCH_HEAD
rm -rf .git
EOF
@@ -880,7 +880,7 @@ COPY --link --from=openssl /usr/src/openssl-cache /
COPY --link --from=xkbcommon /usr/src/xkbcommon-cache /
RUN --mount=type=cache,target=/var/cache/ccache <<EOF
QT=6.11.1
QT=6.11.2
git clone -b v$QT --depth=1 https://github.com/qt/qt5.git
cd qt5
git submodule update --init --recursive --depth=1 \

View File

@@ -458,11 +458,11 @@ if customRunCommand:
stage('patches', """
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout 640c1af2f4e79f80279d382b81079a9609176795
git checkout c2cc44fca4a8d0e20d1ef0f40884d717c750f0a4
mac:
git clone https://github.com/desktop-app/qt6_highsierra_patches.git qt6_highsierra
cd qt6_highsierra
git checkout 4aae812a405f47553e001faf566de572d3eccd16
git checkout 7387476bb3b7200d3b044015696cb3c28f78593c
""")
stage('msys64', """

View File

@@ -2,11 +2,11 @@ import sys, os
def resolve(arch):
if sys.platform == 'darwin':
os.environ['QT'] = '6.11.1'
os.environ['QT'] = '6.11.2'
elif sys.platform == 'win32':
if arch == 'arm' or 'qt6' in sys.argv:
print('Choosing Qt 6.')
os.environ['QT'] = '6.11.1'
os.environ['QT'] = '6.11.2'
else:
print('Choosing Qt 5.')
os.environ['QT'] = '5.15.19'

2
cmake

Submodule cmake updated: ce47e85122...428f37a41f

View File

@@ -122,7 +122,7 @@ parts:
patches:
source: https://github.com/desktop-app/patches.git
source-depth: 1
source-commit: 27efa67b60881c52b112cf924d705e573d03a0ab
source-commit: c2cc44fca4a8d0e20d1ef0f40884d717c750f0a4
plugin: nil
override-pull: |
craftctl default
@@ -376,7 +376,7 @@ parts:
qt:
source: https://github.com/qt/qt5.git
source-depth: 1
source-tag: v6.11.1
source-tag: v6.11.2
source-submodules:
- qtbase
- qtdeclarative