Updated Qt to 6.2.8 on macOS.

This commit is contained in:
23rd 2024-04-22 16:19:42 +03:00 committed by John Preston
parent 287d5a7413
commit 7be68ca82c
2 changed files with 8 additions and 8 deletions

View File

@ -62,7 +62,7 @@ if (NOT DESKTOP_APP_USE_PACKAGED)
if (WIN32) if (WIN32)
set(qt_version 5.15.13) set(qt_version 5.15.13)
elseif (APPLE) elseif (APPLE)
set(qt_version 6.2.7) set(qt_version 6.2.8)
endif() endif()
endif() endif()
include(cmake/external/qt/package.cmake) include(cmake/external/qt/package.cmake)

View File

@ -435,7 +435,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 b35735cd14 git checkout bc31d0a7fd
""") """)
stage('msys64', """ stage('msys64', """
@ -1503,14 +1503,14 @@ mac:
""") """)
if buildQt6: if buildQt6:
stage('qt_6_2_7', """ stage('qt_6_2_8', """
mac: mac:
git clone -b v6.2.7-lts-lgpl https://github.com/qt/qt5.git qt_6_2_7 git clone -b v6.2.8-lts-lgpl https://github.com/qt/qt5.git qt_6_2_8
cd qt_6_2_7 cd qt_6_2_8
git submodule update --init --recursive qtbase qtimageformats qtsvg git submodule update --init --recursive qtbase qtimageformats qtsvg
depends:patches/qtbase_6.2.7/*.patch depends:patches/qtbase_6.2.8/*.patch
cd qtbase cd qtbase
find ../../patches/qtbase_6.2.7 -type f -print0 | sort -z | xargs -0 git apply -v find ../../patches/qtbase_6.2.8 -type f -print0 | sort -z | xargs -0 git apply -v
cd .. cd ..
sed -i.bak 's/tqtc-//' {qtimageformats,qtsvg}/dependencies.yaml sed -i.bak 's/tqtc-//' {qtimageformats,qtsvg}/dependencies.yaml
@ -1518,7 +1518,7 @@ depends:patches/qtbase_6.2.7/*.patch
release: release:
CONFIGURATIONS=-debug-and-release CONFIGURATIONS=-debug-and-release
mac: mac:
./configure -prefix "$USED_PREFIX/Qt-6.2.7" \ ./configure -prefix "$USED_PREFIX/Qt-6.2.8" \
$CONFIGURATIONS \ $CONFIGURATIONS \
-force-debug-info \ -force-debug-info \
-opensource \ -opensource \