Updated Qt to 6.2.6 on macOS.

This commit is contained in:
23rd 2023-11-04 15:53:51 +03:00 committed by John Preston
parent a4e5ea01dc
commit 6def067e98
2 changed files with 8 additions and 8 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.2.5) set(qt_version 6.2.6)
endif() endif()
endif() endif()
include(cmake/external/qt/package.cmake) include(cmake/external/qt/package.cmake)

View File

@ -418,7 +418,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 81a81ffb5a git checkout f603f4f986
""") """)
stage('msys64', """ stage('msys64', """
@ -1381,14 +1381,14 @@ mac:
""") """)
if buildQt6: if buildQt6:
stage('qt_6_2_5', """ stage('qt_6_2_6', """
mac: mac:
git clone -b v6.2.5-lts-lgpl https://code.qt.io/qt/qt5.git qt_6_2_5 git clone -b v6.2.6-lts-lgpl https://code.qt.io/qt/qt5.git qt_6_2_6
cd qt_6_2_5 cd qt_6_2_6
perl init-repository --module-subset=qtbase,qtimageformats,qtsvg perl init-repository --module-subset=qtbase,qtimageformats,qtsvg
depends:patches/qtbase_6.2.5/*.patch depends:patches/qtbase_6.2.6/*.patch
cd qtbase cd qtbase
find ../../patches/qtbase_6.2.5 -type f -print0 | sort -z | xargs -0 git apply find ../../patches/qtbase_6.2.6 -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
@ -1396,7 +1396,7 @@ depends:patches/qtbase_6.2.5/*.patch
release: release:
CONFIGURATIONS=-debug-and-release CONFIGURATIONS=-debug-and-release
mac: mac:
./configure -prefix "$USED_PREFIX/Qt-6.2.5" \ ./configure -prefix "$USED_PREFIX/Qt-6.2.6" \
$CONFIGURATIONS \ $CONFIGURATIONS \
-force-debug-info \ -force-debug-info \
-opensource \ -opensource \