From 587b07a648f42555ccefc15fcd2fcad034b36c4d Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Tue, 2 Apr 2024 16:26:00 +0400 Subject: [PATCH] Update Qt to 6.7.0 on Linux --- Telegram/build/docker/centos_env/Dockerfile | 2 +- snap/snapcraft.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index 290146ce3..0cf935664 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -1,7 +1,7 @@ {%- set GIT = "https://github.com" -%} {%- set GIT_FREEDESKTOP = GIT ~ "/gitlab-freedesktop-mirrors" -%} {%- set QT = "6.7.0" -%} -{%- set QT_TAG = "v" ~ QT ~ "-rc2" -%} +{%- set QT_TAG = "v" ~ QT -%} {%- set CMAKE_VER = "3.27.6" -%} {%- set CMAKE_FILE = "cmake-" ~ CMAKE_VER ~ "-Linux-x86_64.sh" -%} {%- set CFLAGS_DEBUG = "-g -pipe -fPIC -fstack-protector-all -fstack-clash-protection -fcf-protection -D_GLIBCXX_ASSERTIONS" -%} diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index b464b4e91..70eee8050 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -440,7 +440,7 @@ parts: override-pull: | QT=6.7.0 - git clone -b v${QT}-rc2 --depth=1 https://github.com/qt/qt5.git . + git clone -b v${QT} --depth=1 https://github.com/qt/qt5.git . git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools cd qtbase