diff options
| author | Ilya Fedin <fedin-ilja2010@ya.ru> | 2022-09-01 15:55:23 +0400 |
|---|---|---|
| committer | John Preston <johnprestonmail@gmail.com> | 2022-09-02 21:27:41 +0400 |
| commit | 86059f2b5ef4d3d3de8130e62526d25bac2170c0 (patch) | |
| tree | bc733936428ce95f14f7e6fcde3ff3d5f4e74b11 | |
| parent | 4f261ced8ea242da4ed92e50447e2028d143eca8 (diff) | |
Update Qt to 6.4.0 beta4 on Linux
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Telegram/build/docker/centos_env/Dockerfile | 8 | ||||
| m--------- | Telegram/lib_base | 0 | ||||
| m--------- | Telegram/lib_ui | 0 | ||||
| m--------- | cmake | 0 | ||||
| -rw-r--r-- | snap/snapcraft.yaml | 6 |
6 files changed, 10 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d170fe480..234a17a9d8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,8 +51,10 @@ include(cmake/options.cmake) if (NOT DESKTOP_APP_USE_PACKAGED) if (WIN32) set(qt_version 5.15.4) - else() + elseif (APPLE) set(qt_version 6.3.1) + else() + set(qt_version 6.4.0) endif() endif() include(cmake/external/qt/package.cmake) diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index d0402cf6fe..c0ec528cdc 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -1,8 +1,8 @@ {%- set GIT = "https://github.com" -%} {%- set GIT_FREEDESKTOP = GIT ~ "/gitlab-freedesktop-mirrors" -%} -{%- set QT = "6_3_1" -%} -{%- set QT_TAG = "v6.3.1" -%} -{%- set QT_PREFIX = "/usr/local/desktop-app/Qt-6.3.1" -%} +{%- set QT = "6_4_0" -%} +{%- set QT_TAG = "v6.4.0-beta4" -%} +{%- 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" -%} {%- set CMAKE_VER = "3.21.3" -%} @@ -48,7 +48,7 @@ RUN mkdir /opt/cmake \ FROM builder AS patches RUN git clone {{ GIT }}/desktop-app/patches.git \ && cd patches \ - && git checkout 4a5c759f8f \ + && git checkout d939423196 \ && rm -rf .git FROM builder AS extra-cmake-modules diff --git a/Telegram/lib_base b/Telegram/lib_base -Subproject 37fab6b4da32c91bc5d049baad2e9ad51cfcd19 +Subproject f65e7748b14921e083076add53447f242438f25 diff --git a/Telegram/lib_ui b/Telegram/lib_ui -Subproject f420e302d7992e10cae8924701c3a3a85c0aa8b +Subproject 95dd2c8465d4b5bfcbcdb47ce7a1d1e743d0447 diff --git a/cmake b/cmake -Subproject 7b43684a1caab158ef0b8884c20fe9d1436872a +Subproject b9f1b6036329e44ec61f51f0b363fe2319158b8 diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 738efe616d..bd1b30a78a 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -396,9 +396,9 @@ parts: - libxkbcommon-x11-0 - zlib1g override-pull: | - QT=6_3_1 + QT=6_4_0 - git clone -b v6.3.1 --depth=1 git://code.qt.io/qt/qt5.git . + git clone -b v6.4.0-beta4 --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.3.1 + source-tag: v6.4.0-beta4 plugin: cmake build-packages: - clang |