Skip to content

Commit

Permalink
Update Qt to 6.2.5 on macOS
Browse files Browse the repository at this point in the history
  • Loading branch information
ilya-fedin committed Sep 21, 2023
1 parent 8c9014f commit 1e2ac51
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ if (NOT DESKTOP_APP_USE_PACKAGED)
if (WIN32)
set(qt_version 5.15.10)
elseif (APPLE)
set(qt_version 6.3.2)
set(qt_version 6.2.5)
endif()
endif()
include(cmake/external/qt/package.cmake)
Expand Down
16 changes: 8 additions & 8 deletions Telegram/build/prepare/prepare.py
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ def runStages():
stage('patches', """
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout dbaa6eb6f9
git checkout a46fa17091
""")

stage('msys64', """
Expand Down Expand Up @@ -1363,22 +1363,22 @@ def runStages():
""")

if buildQt6:
stage('qt_6_3_2', """
stage('qt_6_2_5', """
mac:
git clone -b v6.3.2 https://code.qt.io/qt/qt5.git qt_6_3_2
cd qt_6_3_2
git clone -b v6.2.5-lts-lgpl https://code.qt.io/qt/qt5.git qt_6_2_5
cd qt_6_2_5
perl init-repository --module-subset=qtbase,qtimageformats,qtsvg
depends:patches/qtbase_6.3.2/*.patch
depends:patches/qtbase_6.2.5/*.patch
cd qtbase
find ../../patches/qtbase_6.3.2 -type f -print0 | sort -z | xargs -0 git apply
find ../../patches/qtbase_6.2.5 -type f -print0 | sort -z | xargs -0 git apply
cd ..
sed -i.bak 's/tqtc-//' {qtimageformats,qtsvg}/dependencies.yaml
CONFIGURATIONS=-debug
release:
CONFIGURATIONS=-debug-and-release
mac:
./configure -prefix "$USED_PREFIX/Qt-6.3.2" \
./configure -prefix "$USED_PREFIX/Qt-6.2.5" \
$CONFIGURATIONS \
-force-debug-info \
-opensource \
Expand Down

0 comments on commit 1e2ac51

Please sign in to comment.