Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Qt 5.15.15 with OpenSSL 3.3.2 #4223

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Qt 5.15.15 with OpenSSL 3.3.2 #4223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,17 +67,17 @@ on:
- '**/COPYING'

env:
qt_version: 5.15.14
qt_version: 5.15.15
qt6_version: 6.3.1
openssl_version: 3.3.1
ghSsl_user: xanasoft
ghSsl_repo: openssl-builds
openssl_version: 3.3.2
ghSsl_user: offhub #xanasoft
ghSsl_repo: openssl #openssl-builds
#ghQt6Win7_user: DavidXanatos
#ghQt6Win7_repo: qtbase
ghQtBuilds_user: xanasoft
ghQtBuilds_repo: qt-builds
ghQtBuilds_hash_x86: bf4124046cc50ccbbeb3f786c041e884fd4205cd6e616070a75c850105cbf1db
ghQtBuilds_hash_x64: 30290d82a02bfaa24c1bf37bcb9c074aba18a673a7176628fccdf71197cee898
ghQtBuilds_user: offhub #xanasoft
ghQtBuilds_repo: qt-sbie-builds #qt-builds
ghQtBuilds_hash_x86: 13928d0ff1bc461ef1d054aa19f1427b172277c6659d0ccf1999e6ffa850126e
ghQtBuilds_hash_x64: ebe1f2351b7313b8b0678aadf81c9edacf04af84572b72a576972ee2fb8d5aea

jobs:
Build_x64:
Expand All @@ -86,7 +86,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v4.1.5
uses: actions/checkout@v4.1.7

- name: Setup msbuild
uses: microsoft/setup-msbuild@v2
Expand Down Expand Up @@ -187,7 +187,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v4.1.5
uses: actions/checkout@v4.1.7

- name: Setup msbuild
uses: microsoft/setup-msbuild@v2
Expand Down Expand Up @@ -281,7 +281,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v4.1.5
uses: actions/checkout@v4.1.7

- name: Setup msbuild
uses: microsoft/setup-msbuild@v2
Expand Down
4 changes: 2 additions & 2 deletions Installer/copy_build.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
REM @ECHO OFF

echo %*
IF "%~4" == "" ( set "openssl_version=3.3.1" ) ELSE ( set "openssl_version=%~4" )
IF "%~4" == "" ( set "openssl_version=3.3.2" ) 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.14" ) ELSE ( set "qt_version=%~2" )
IF "%~2" == "" ( set "qt_version=5.15.15" ) ELSE ( set "qt_version=%~2" )

IF "%openssl_version:~0,3%" == "1.1" ( set "sslMajorVersion=1_1" ) ELSE ( set "sslMajorVersion=3" )

Expand Down
2 changes: 1 addition & 1 deletion Installer/fix_qt5_languages.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.14" ) ELSE ( set "qt_version=%~2" )
IF "%~2" == "" ( set "qt_version=5.15.15" ) 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\
Expand Down
6 changes: 3 additions & 3 deletions Installer/get_openssl.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.1" ) ELSE ( set "openssl_version=%~1" )
IF "%~3" == "" ( set "ghSsl_repo=openssl" ) ELSE ( set "ghSsl_repo=%~3" )
IF "%~2" == "" ( set "ghSsl_user=offhub" ) ELSE ( set "ghSsl_user=%~2" )
IF "%~1" == "" ( set "openssl_version=3.3.2" ) ELSE ( set "openssl_version=%~1" )

set "openssl_version_underscore=%openssl_version:.=_%"

Expand Down
10 changes: 5 additions & 5 deletions SandboxiePlus/install_qt.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
echo %*
IF "%~7" == "" ( set "ghQtBuilds_hash_x64=30290d82a02bfaa24c1bf37bcb9c074aba18a673a7176628fccdf71197cee898" ) ELSE ( set "ghQtBuilds_hash_x64=%~7" )
IF "%~6" == "" ( set "ghQtBuilds_hash_x86=bf4124046cc50ccbbeb3f786c041e884fd4205cd6e616070a75c850105cbf1db" ) 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 "%~7" == "" ( set "ghQtBuilds_hash_x64=ebe1f2351b7313b8b0678aadf81c9edacf04af84572b72a576972ee2fb8d5aea" ) ELSE ( set "ghQtBuilds_hash_x64=%~7" )
IF "%~6" == "" ( set "ghQtBuilds_hash_x86=13928d0ff1bc461ef1d054aa19f1427b172277c6659d0ccf1999e6ffa850126e" ) ELSE ( set "ghQtBuilds_hash_x86=%~6" )
IF "%~5" == "" ( set "ghQtBuilds_repo=qt-sbie-builds" ) ELSE ( set "ghQtBuilds_repo=%~5" )
IF "%~4" == "" ( set "ghQtBuilds_user=offhub" ) 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.14" ) ELSE ( set "qt_version=%~2" )
IF "%~2" == "" ( set "qt_version=5.15.15" ) ELSE ( set "qt_version=%~2" )

if %1 == Win32 (
if exist %~dp0..\..\Qt\%qt_version%\msvc2019\bin\qmake.exe goto done
Expand Down
2 changes: 1 addition & 1 deletion SandboxiePlus/qmake_plus.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.14" ) ELSE ( set "qt_version=%~2" )
IF "%~2" == "" ( set "qt_version=5.15.15" ) ELSE ( set "qt_version=%~2" )

IF %1 == Win32 (
set qt_path=%~dp0..\..\Qt\%qt_version%\msvc2019
Expand Down