Updated Qt to 6.2.7 on macOS.
This commit is contained in:
parent
d8d9441731
commit
758219265a
|
@ -62,7 +62,7 @@ if (NOT DESKTOP_APP_USE_PACKAGED)
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
set(qt_version 5.15.11)
|
set(qt_version 5.15.11)
|
||||||
elseif (APPLE)
|
elseif (APPLE)
|
||||||
set(qt_version 6.2.6)
|
set(qt_version 6.2.7)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
include(cmake/external/qt/package.cmake)
|
include(cmake/external/qt/package.cmake)
|
||||||
|
|
|
@ -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 58c8cd0c0f
|
git checkout 182c4076ab
|
||||||
""")
|
""")
|
||||||
|
|
||||||
stage('msys64', """
|
stage('msys64', """
|
||||||
|
@ -1386,14 +1386,14 @@ mac:
|
||||||
""")
|
""")
|
||||||
|
|
||||||
if buildQt6:
|
if buildQt6:
|
||||||
stage('qt_6_2_6', """
|
stage('qt_6_2_7', """
|
||||||
mac:
|
mac:
|
||||||
git clone -b v6.2.6-lts-lgpl https://github.com/qt/qt5.git qt_6_2_6
|
git clone -b v6.2.7-lts-lgpl https://github.com/qt/qt5.git qt_6_2_7
|
||||||
cd qt_6_2_6
|
cd qt_6_2_7
|
||||||
perl init-repository --module-subset=qtbase,qtimageformats,qtsvg
|
perl init-repository --module-subset=qtbase,qtimageformats,qtsvg
|
||||||
depends:patches/qtbase_6.2.6/*.patch
|
depends:patches/qtbase_6.2.7/*.patch
|
||||||
cd qtbase
|
cd qtbase
|
||||||
find ../../patches/qtbase_6.2.6 -type f -print0 | sort -z | xargs -0 git apply -v
|
find ../../patches/qtbase_6.2.7 -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
|
||||||
|
|
||||||
|
@ -1401,7 +1401,7 @@ depends:patches/qtbase_6.2.6/*.patch
|
||||||
release:
|
release:
|
||||||
CONFIGURATIONS=-debug-and-release
|
CONFIGURATIONS=-debug-and-release
|
||||||
mac:
|
mac:
|
||||||
./configure -prefix "$USED_PREFIX/Qt-6.2.6" \
|
./configure -prefix "$USED_PREFIX/Qt-6.2.7" \
|
||||||
$CONFIGURATIONS \
|
$CONFIGURATIONS \
|
||||||
-force-debug-info \
|
-force-debug-info \
|
||||||
-opensource \
|
-opensource \
|
||||||
|
|
Loading…
Reference in New Issue