parent
4db2b83c9b
commit
cd85c4911c
|
@ -54,7 +54,7 @@ if (NOT DESKTOP_APP_USE_PACKAGED)
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
set(qt_version 5.15.4)
|
set(qt_version 5.15.4)
|
||||||
elseif (APPLE)
|
elseif (APPLE)
|
||||||
set(qt_version 6.3.1)
|
set(qt_version 6.3.2)
|
||||||
else()
|
else()
|
||||||
set(qt_version 6.4.1)
|
set(qt_version 6.4.1)
|
||||||
endif()
|
endif()
|
||||||
|
|
|
@ -397,7 +397,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 b14854c6f6
|
git checkout 2af5b01c6b
|
||||||
""")
|
""")
|
||||||
|
|
||||||
stage('msys64', """
|
stage('msys64', """
|
||||||
|
@ -1147,22 +1147,22 @@ mac:
|
||||||
""")
|
""")
|
||||||
|
|
||||||
if buildQt6:
|
if buildQt6:
|
||||||
stage('qt_6_3_1', """
|
stage('qt_6_3_2', """
|
||||||
mac:
|
mac:
|
||||||
git clone -b v6.3.1 https://code.qt.io/qt/qt5.git qt_6_3_1
|
git clone -b v6.3.2 https://code.qt.io/qt/qt5.git qt_6_3_2
|
||||||
cd qt_6_3_1
|
cd qt_6_3_2
|
||||||
perl init-repository --module-subset=qtbase,qtimageformats,qtsvg,qt5compat
|
perl init-repository --module-subset=qtbase,qtimageformats,qtsvg,qt5compat
|
||||||
depends:patches/qtbase_6_3_1/*.patch
|
depends:patches/qtbase_6_3_2/*.patch
|
||||||
cd qtbase
|
cd qtbase
|
||||||
|
|
||||||
find ../../patches/qtbase_6_3_1 -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 ..
|
||||||
|
|
||||||
CONFIGURATIONS=-debug
|
CONFIGURATIONS=-debug
|
||||||
release:
|
release:
|
||||||
CONFIGURATIONS=-debug-and-release
|
CONFIGURATIONS=-debug-and-release
|
||||||
mac:
|
mac:
|
||||||
./configure -prefix "$USED_PREFIX/Qt-6.3.1" \
|
./configure -prefix "$USED_PREFIX/Qt-6.3.2" \
|
||||||
$CONFIGURATIONS \
|
$CONFIGURATIONS \
|
||||||
-force-debug-info \
|
-force-debug-info \
|
||||||
-opensource \
|
-opensource \
|
||||||
|
|
Loading…
Reference in New Issue