Qt Update 5.15.16
This commit is contained in:
parent
b3c28d120c
commit
c625e90b7a
|
@ -69,17 +69,17 @@ on:
|
|||
- '**/COPYING'
|
||||
|
||||
env:
|
||||
qt_version: 5.15.15
|
||||
qt_version: 5.15.16
|
||||
qt6_version: 6.3.1
|
||||
openssl_version: 3.3.2
|
||||
openssl_version: 3.4.0
|
||||
ghSsl_user: xanasoft
|
||||
ghSsl_repo: openssl-builds
|
||||
#ghQt6Win7_user: DavidXanatos
|
||||
#ghQt6Win7_repo: qtbase
|
||||
ghQtBuilds_user: xanasoft
|
||||
ghQtBuilds_repo: qt-builds
|
||||
ghQtBuilds_hash_x86: 0dc0048be815eeaa76bcdd2d02e7028d21cc75fd7f4fb65445d3adf37b4a75bb
|
||||
ghQtBuilds_hash_x64: bae6773292ad187aad946854766344c4bd24245359404636b3a1b13d9ae6a97e
|
||||
ghQtBuilds_hash_x86: 502e9a36a52918af4e116cd74c16c6c260d029087aaeee3775ab0e5d3f6a2705
|
||||
ghQtBuilds_hash_x64: 673c288feeabd11ec66f9f454d49cde3945cbd3e3f71283b7a6c4df0893b19f2
|
||||
|
||||
jobs:
|
||||
Build_x64:
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
REM @ECHO OFF
|
||||
|
||||
echo %*
|
||||
IF "%~4" == "" ( set "openssl_version=3.3.2" ) ELSE ( set "openssl_version=%~4" )
|
||||
IF "%~4" == "" ( set "openssl_version=3.4.0" ) ELSE ( set "openssl_version=%~4" )
|
||||
IF "%~3" == "" ( set "qt6_version=6.3.1" ) ELSE ( set "qt6_version=%~3" )
|
||||
IF "%~2" == "" ( set "qt_version=5.15.15" ) ELSE ( set "qt_version=%~2" )
|
||||
IF "%~2" == "" ( set "qt_version=5.15.16" ) ELSE ( set "qt_version=%~2" )
|
||||
|
||||
IF "%openssl_version:~0,3%" == "1.1" ( set "sslMajorVersion=1_1" ) ELSE ( set "sslMajorVersion=3" )
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
echo %*
|
||||
IF "%~3" == "" ( set "qt6_version=6.3.1" ) ELSE ( set "qt6_version=%~3" )
|
||||
IF "%~2" == "" ( set "qt_version=5.15.15" ) ELSE ( set "qt_version=%~2" )
|
||||
IF "%~2" == "" ( set "qt_version=5.15.16" ) ELSE ( set "qt_version=%~2" )
|
||||
|
||||
if %1 == x64 if exist %~dp0..\..\Qt\%qt_version%\msvc2019_64\bin\lrelease.exe set PATH=%PATH%;%~dp0..\..\Qt\%qt_version%\msvc2019_64\bin\
|
||||
if %1 == Win32 if exist %~dp0..\..\Qt\%qt_version%\msvc2019\bin\lrelease.exe set PATH=%PATH%;%~dp0..\..\Qt\%qt_version%\msvc2019\bin\
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
echo %*
|
||||
IF "%~3" == "" ( set "ghSsl_repo=openssl-builds" ) ELSE ( set "ghSsl_repo=%~3" )
|
||||
IF "%~2" == "" ( set "ghSsl_user=xanasoft" ) ELSE ( set "ghSsl_user=%~2" )
|
||||
IF "%~1" == "" ( set "openssl_version=3.3.2" ) ELSE ( set "openssl_version=%~1" )
|
||||
IF "%~1" == "" ( set "openssl_version=3.4.0" ) ELSE ( set "openssl_version=%~1" )
|
||||
|
||||
set "openssl_version_underscore=%openssl_version:.=_%"
|
||||
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
echo %*
|
||||
IF "%~7" == "" ( set "ghQtBuilds_hash_x64=bae6773292ad187aad946854766344c4bd24245359404636b3a1b13d9ae6a97e" ) ELSE ( set "ghQtBuilds_hash_x64=%~7" )
|
||||
IF "%~6" == "" ( set "ghQtBuilds_hash_x86=0dc0048be815eeaa76bcdd2d02e7028d21cc75fd7f4fb65445d3adf37b4a75bb" ) ELSE ( set "ghQtBuilds_hash_x86=%~6" )
|
||||
IF "%~7" == "" ( set "ghQtBuilds_hash_x64=673c288feeabd11ec66f9f454d49cde3945cbd3e3f71283b7a6c4df0893b19f2" ) ELSE ( set "ghQtBuilds_hash_x64=%~7" )
|
||||
IF "%~6" == "" ( set "ghQtBuilds_hash_x86=502e9a36a52918af4e116cd74c16c6c260d029087aaeee3775ab0e5d3f6a2705" ) ELSE ( set "ghQtBuilds_hash_x86=%~6" )
|
||||
IF "%~5" == "" ( set "ghQtBuilds_repo=qt-builds" ) ELSE ( set "ghQtBuilds_repo=%~5" )
|
||||
IF "%~4" == "" ( set "ghQtBuilds_user=xanasoft" ) ELSE ( set "ghQtBuilds_user=%~4" )
|
||||
IF "%~3" == "" ( set "qt6_version=6.3.1" ) ELSE ( set "qt6_version=%~3" )
|
||||
IF "%~2" == "" ( set "qt_version=5.15.15" ) ELSE ( set "qt_version=%~2" )
|
||||
IF "%~2" == "" ( set "qt_version=5.15.16" ) ELSE ( set "qt_version=%~2" )
|
||||
|
||||
if %1 == Win32 (
|
||||
if exist %~dp0..\..\Qt\%qt_version%\msvc2019\bin\qmake.exe goto done
|
||||
|
|
|
@ -7,7 +7,7 @@ REM echo qt6_version: %3
|
|||
|
||||
echo %*
|
||||
IF "%~3" == "" ( set "qt6_version=6.3.1" ) ELSE ( set "qt6_version=%~3" )
|
||||
IF "%~2" == "" ( set "qt_version=5.15.15" ) ELSE ( set "qt_version=%~2" )
|
||||
IF "%~2" == "" ( set "qt_version=5.15.16" ) ELSE ( set "qt_version=%~2" )
|
||||
|
||||
IF %1 == Win32 (
|
||||
set qt_path=%~dp0..\..\Qt\%qt_version%\msvc2019
|
||||
|
|
Loading…
Reference in New Issue