Update Qt to 6.2.5 on macOS

This commit is contained in:
Ilya Fedin 2023-09-21 12:42:54 +04:00 committed by John Preston
parent 1683dccb50
commit 277fe540dc
3 changed files with 10 additions and 10 deletions

View File

@ -61,7 +61,7 @@ if (NOT DESKTOP_APP_USE_PACKAGED)
if (WIN32) if (WIN32)
set(qt_version 5.15.10) set(qt_version 5.15.10)
elseif (APPLE) elseif (APPLE)
set(qt_version 6.3.2) set(qt_version 6.2.5)
endif() endif()
endif() endif()
include(cmake/external/qt/package.cmake) include(cmake/external/qt/package.cmake)

View File

@ -404,7 +404,7 @@ if customRunCommand:
stage('patches', """ stage('patches', """
git clone https://github.com/desktop-app/patches.git git clone https://github.com/desktop-app/patches.git
cd patches cd patches
git checkout dbaa6eb6f9 git checkout b1907e1250
""") """)
stage('msys64', """ stage('msys64', """
@ -1363,22 +1363,22 @@ mac:
""") """)
if buildQt6: if buildQt6:
stage('qt_6_3_2', """ stage('qt_6_2_5', """
mac: mac:
git clone -b v6.3.2 https://code.qt.io/qt/qt5.git 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_3_2 cd qt_6_2_5
perl init-repository --module-subset=qtbase,qtimageformats,qtsvg perl init-repository --module-subset=qtbase,qtimageformats,qtsvg
depends:patches/qtbase_6.3.2/*.patch depends:patches/qtbase_6.2.5/*.patch
cd qtbase cd qtbase
find ../../patches/qtbase_6.2.5 -type f -print0 | sort -z | xargs -0 git apply
find ../../patches/qtbase_6.3.2 -type f -print0 | sort -z | xargs -0 git apply
cd .. cd ..
sed -i.bak 's/tqtc-//' {qtimageformats,qtsvg}/dependencies.yaml
CONFIGURATIONS=-debug CONFIGURATIONS=-debug
release: release:
CONFIGURATIONS=-debug-and-release CONFIGURATIONS=-debug-and-release
mac: mac:
./configure -prefix "$USED_PREFIX/Qt-6.3.2" \ ./configure -prefix "$USED_PREFIX/Qt-6.2.5" \
$CONFIGURATIONS \ $CONFIGURATIONS \
-force-debug-info \ -force-debug-info \
-opensource \ -opensource \

@ -1 +1 @@
Subproject commit f317f20ac831c9564575f9ce6f0d3f8b40aa4c90 Subproject commit a33bd4e0a590fb08f0055b6e859ce84db11eb843