MrBesen
/
tdesktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update Qt to 6.5.0 on Linux

This commit is contained in:
Ilya Fedin 2023-03-20 18:19:34 +04:00 committed by John Preston
parent d52cabb386
commit a529932556
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/build/docker/centos_env/Dockerfile
View File

@ -1,7 +1,7 @@
{%- set GIT = "https://github.com" -%}
{%- set GIT_FREEDESKTOP = GIT ~ "/gitlab-freedesktop-mirrors" -%}
{%- set QT = "6.5.0" -%}
{%- set QT_TAG = "v" ~ QT ~ "-beta3" -%}
{%- set QT_TAG = "v" ~ QT -%}
{%- set QT_PREFIX = "/usr/local/desktop-app/Qt-" ~ QT -%}
{%- set OPENSSL_VER = "1_1_1" -%}
{%- set OPENSSL_PREFIX = "/usr/local/desktop-app/openssl-1.1.1" -%}
@ -724,8 +724,6 @@ RUN git clone -b {{ QT_TAG }} --depth=1 git://code.qt.io/qt/qt5.git qt_{{ QT }}
&& sed -i '/add_subdirectory(quickcontrols)/d' src/CMakeLists.txt \
&& sed -i '/add_subdirectory(quickdialogs)/d' src/CMakeLists.txt \
&& sed -i '/add_subdirectory(quicknativestyle)/d' src/CMakeLists.txt \
&& cd ../qtwayland \
&& sed -i '/| MFD_ALLOW_SEALING/{n;N;d}' src/client/qwaylandshmbackingstore.cpp \
&& cd .. \
&& ./configure -prefix "{{ QT_PREFIX }}" \
CMAKE_BUILD_TYPE=None \

2
snap/snapcraft.yaml
View File

@ -488,7 +488,7 @@ parts:
override-pull: |
QT=6.5.0
git clone -b v${QT}-beta3 --depth=1 git://code.qt.io/qt/qt5.git .
git clone -b v${QT} --depth=1 git://code.qt.io/qt/qt5.git .
git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qt5compat qtshadertools
cd qtbase