Update Qt to 6.4.0 rc1

This commit is contained in:
Ilya Fedin 2022-09-16 09:44:01 +04:00 committed by John Preston
parent 1043467eec
commit 552d96df71
2 changed files with 4 additions and 4 deletions

View File

@ -1,7 +1,7 @@
{%- set GIT = "https://github.com" -%}
{%- set GIT_FREEDESKTOP = GIT ~ "/gitlab-freedesktop-mirrors" -%}
{%- set QT = "6_4_0" -%}
{%- set QT_TAG = "v6.4.0-beta4" -%}
{%- set QT_TAG = "v6.4.0-rc1" -%}
{%- set QT_PREFIX = "/usr/local/desktop-app/Qt-6.4.0" -%}
{%- set OPENSSL_VER = "1_1_1" -%}
{%- set OPENSSL_PREFIX = "/usr/local/desktop-app/openssl-1.1.1" -%}
@ -48,7 +48,7 @@ RUN mkdir /opt/cmake \
FROM builder AS patches
RUN git clone {{ GIT }}/desktop-app/patches.git \
&& cd patches \
&& git checkout 88c251102f \
&& git checkout 355c563138 \
&& rm -rf .git
FROM builder AS extra-cmake-modules

View File

@ -398,7 +398,7 @@ parts:
override-pull: |
QT=6_4_0
git clone -b v6.4.0-beta4 --depth=1 git://code.qt.io/qt/qt5.git .
git clone -b v6.4.0-rc1 --depth=1 git://code.qt.io/qt/qt5.git .
perl init-repository --module-subset=qtbase,qtwayland,qtimageformats,qtsvg,qt5compat
cd qtbase
@ -446,7 +446,7 @@ parts:
qttools:
source: git://code.qt.io/qt/qttools.git
source-depth: 1
source-tag: v6.4.0-beta4
source-tag: v6.4.0-rc1
plugin: cmake
build-packages:
- clang