mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2026-07-25 06:54:43 +00:00
Qt 6.10.1 -> 6.10.2
This commit is contained in:
@@ -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 6eee01a2c24ed9a2bd4510a5087b489ab842d00e \
|
||||
&& git fetch --depth=1 origin b8c3a8ffc1514861837b9213383133c63023e0de \
|
||||
&& git reset --hard FETCH_HEAD \
|
||||
&& 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=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 \
|
||||
&& cd qt5 \
|
||||
&& git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools \
|
||||
|
||||
@@ -452,7 +452,7 @@ if customRunCommand:
|
||||
stage('patches', """
|
||||
git clone https://github.com/desktop-app/patches.git
|
||||
cd patches
|
||||
git checkout 6eee01a2c24ed9a2bd4510a5087b489ab842d00e
|
||||
git checkout b8c3a8ffc1514861837b9213383133c63023e0de
|
||||
""")
|
||||
|
||||
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.10.1'
|
||||
os.environ['QT'] = '6.10.2'
|
||||
else:
|
||||
print('Choosing Qt 5.')
|
||||
os.environ['QT'] = '5.15.18'
|
||||
|
||||
Reference in New Issue
Block a user