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

Move macOS and Linux builds to Qt 6.2.2.

Browse Source
This commit is contained in:
John Preston 2021-12-21 15:46:27 +00:00
parent 999e4264c5
commit b341dddbb9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/ThirdParty/tgcalls vendored

@ -1 +1 @@
Subproject commit c2c83dc44ecbfa892d267cde5906a219df9199d2
Subproject commit 6dbefa5bfc0fdf07eb42af103d8af0f481511c2a

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

@ -9,9 +9,9 @@ ENV QT5_VER 5_15_2
ENV QT5_TAG v5.15.2
ENV QT5_PREFIX /usr/local/desktop-app/Qt-5.15.2
ENV Qt5_DIR ${QT5_PREFIX}
ENV QT6_VER 6_2_0
ENV QT6_TAG v6.2.0
ENV QT6_PREFIX /usr/local/desktop-app/Qt-6.2.0
ENV QT6_VER 6_2_2
ENV QT6_TAG v6.2.2
ENV QT6_PREFIX /usr/local/desktop-app/Qt-6.2.2
ENV Qt6_DIR ${QT6_PREFIX}
ENV OPENSSL_VER 1_1_1
ENV OPENSSL_PREFIX /usr/local/desktop-app/openssl-1.1.1
@ -46,7 +46,7 @@ RUN ln -s /opt/cmake/bin/cmake /usr/local/bin/cmake
RUN rm $CMAKE_FILE
FROM builder AS patches
RUN git clone $GIT/desktop-app/patches.git && cd patches && git checkout b6c29e99da
RUN git clone $GIT/desktop-app/patches.git && cd patches && git checkout 5368789dc7
FROM builder AS extra-cmake-modules