mirror of
https://github.com/Qz3rK/tdesktop.git
synced 2026-06-02 03:53:42 +02:00
Qt 6.11.0 -> 6.11.1
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 4519c85c924b9da81f29d4aac045886f896ee479 \
|
||||
&& git fetch --depth=1 origin 3128a5b5879c450f686f240cc9602ad7f4a054b4 \
|
||||
&& git reset --hard FETCH_HEAD \
|
||||
&& rm -rf .git
|
||||
|
||||
@@ -743,7 +743,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.11.0
|
||||
ENV QT=6.11.1
|
||||
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 4519c85c924b9da81f29d4aac045886f896ee479
|
||||
git checkout 3128a5b5879c450f686f240cc9602ad7f4a054b4
|
||||
""")
|
||||
|
||||
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.11.0'
|
||||
os.environ['QT'] = '6.11.1'
|
||||
else:
|
||||
print('Choosing Qt 5.')
|
||||
os.environ['QT'] = '5.15.18'
|
||||
|
||||
+2
-2
@@ -122,7 +122,7 @@ parts:
|
||||
patches:
|
||||
source: https://github.com/desktop-app/patches.git
|
||||
source-depth: 1
|
||||
source-commit: 4519c85c924b9da81f29d4aac045886f896ee479
|
||||
source-commit: 3128a5b5879c450f686f240cc9602ad7f4a054b4
|
||||
plugin: nil
|
||||
override-pull: |
|
||||
craftctl default
|
||||
@@ -375,7 +375,7 @@ parts:
|
||||
qt:
|
||||
source: https://github.com/qt/qt5.git
|
||||
source-depth: 1
|
||||
source-tag: v6.11.0
|
||||
source-tag: v6.11.1
|
||||
source-submodules:
|
||||
- qtbase
|
||||
- qtdeclarative
|
||||
|
||||
Reference in New Issue
Block a user