From d2d41f978d534e98aaa927d5043bfce3dcf97f39 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 5 Mar 2022 17:03:03 +0400
Subject: [PATCH] Update Qt to 6.2.3 on macOS and Linux.

---
 Telegram/build/docker/centos_env/Dockerfile |  8 ++++----
 Telegram/build/prepare/prepare.py           | 18 +++++++++---------
 Telegram/lib_ui                             |  2 +-
 cmake                                       |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 551cdebb47..3c1daed645 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -10,9 +10,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_2
-ENV QT6_TAG v6.2.2
-ENV QT6_PREFIX /usr/local/desktop-app/Qt-6.2.2
+ENV QT6_VER 6_2_3
+ENV QT6_TAG v6.2.3
+ENV QT6_PREFIX /usr/local/desktop-app/Qt-6.2.3
 ENV Qt6_DIR ${QT6_PREFIX}
 ENV OPENSSL_VER 1_1_1
 ENV OPENSSL_PREFIX /usr/local/desktop-app/openssl-1.1.1
@@ -51,7 +51,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 1206363d59
+RUN git clone $GIT/desktop-app/patches.git && cd patches && git checkout 49d233d5de
 
 FROM builder AS libffi
 RUN git clone -b v3.4.2 --depth=1 $GIT/libffi/libffi.git
diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index 4b83c2fd31..ca821bf617 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -400,7 +400,7 @@ if customRunCommand:
 stage('patches', """
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout 47d447b531
+    git checkout 49d233d5de
 """)
 
 stage('depot_tools', """
@@ -1195,28 +1195,28 @@ mac:
 """)
 
 if buildQt6:
-    stage('qt_6_2_2', """
+    stage('qt_6_2_3', """
 mac:
-    git clone -b v6.2.2 https://code.qt.io/qt/qt5.git qt_6_2_2
-    cd qt_6_2_2
+    git clone -b v6.2.3 https://code.qt.io/qt/qt5.git qt_6_2_3
+    cd qt_6_2_3
     perl init-repository --module-subset=qtbase,qtimageformats,qtsvg,qt5compat
-depends:patches/qtbase_6_2_2/*.patch
+depends:patches/qtbase_6_2_3/*.patch
     cd qtbase
 
-    find ../../patches/qtbase_6_2_2 -type f -print0 | sort -z | xargs -0 git apply
+    find ../../patches/qtbase_6_2_3 -type f -print0 | sort -z | xargs -0 git apply
     cd ..
 
-depends:patches/qt5compat_6_2_2/*.patch
+depends:patches/qt5compat_6_2_3/*.patch
     cd qt5compat
 
-    find ../../patches/qt5compat_6_2_2 -type f -print0 | sort -z | xargs -0 git apply
+    find ../../patches/qt5compat_6_2_3 -type f -print0 | sort -z | xargs -0 git apply
     cd ..
 
     CONFIGURATIONS=-debug
 release:
     CONFIGURATIONS=-debug-and-release
 mac:
-    ./configure -prefix "$USED_PREFIX/Qt-6.2.2" \
+    ./configure -prefix "$USED_PREFIX/Qt-6.2.3" \
         $CONFIGURATIONS \
         -force-debug-info \
         -opensource \
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index d2e482dac3..f2c77daccc 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit d2e482dac3e5ddbc200228d14d04d7d624c98af7
+Subproject commit f2c77daccc055da283d0b5985f9c0c774a28709b
diff --git a/cmake b/cmake
index f05023bb10..aa71b768bd 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit f05023bb10c69de6395a16f00f9003ee6256e4e4
+Subproject commit aa71b768bd6e958753a5e5ced5203d65cc93a6b1