Skip to content

Commit

Permalink
Autobuild: Windows: Build with Qt 6.2.3 on 64bit
Browse files Browse the repository at this point in the history
32bit builds remain on 5.15.2, as Qt6 is not available there.
  • Loading branch information
hoffie committed Feb 7, 2022
1 parent 4de8c88 commit 39d3196
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
3 changes: 2 additions & 1 deletion autobuild/windows/autobuild_windowsinstaller_1_prepare.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ $ErrorActionPreference = "Stop"
###################

$QtDir = 'C:\Qt'
# Qt6 does not provide 32bit binaries, so use latest Qt5 instead:
$Qt32Version = "5.15.2"
$Qt64Version = "5.15.2"
$Qt64Version = "6.2.3"
$AqtinstallVersion = "2.0.5"
$JackVersion = "1.9.17"
$MsvcVersion = "2019"
Expand Down
4 changes: 2 additions & 2 deletions autobuild/windows/autobuild_windowsinstaller_2_build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ echo "Build installer..."
# Build the installer
if ($BuildOption -ne "")
{
powershell "$jamulus_project_path\windows\deploy_windows.ps1" "C:\Qt\5.15.2" "C:\Qt\5.15.2" -BuildOption $BuildOption
powershell "$jamulus_project_path\windows\deploy_windows.ps1" "C:\Qt\5.15.2" "C:\Qt\6.2.3" -BuildOption $BuildOption
}
else
{
powershell "$jamulus_project_path\windows\deploy_windows.ps1" "C:\Qt\5.15.2" "C:\Qt\5.15.2"
powershell "$jamulus_project_path\windows\deploy_windows.ps1" "C:\Qt\5.15.2" "C:\Qt\6.2.3"
}
if ( !$? )
{
Expand Down
2 changes: 1 addition & 1 deletion windows/deploy_windows.ps1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
param (
# Replace default path with system Qt installation folder if necessary
[string] $QtInstallPath32 = "C:\Qt\5.15.2",
[string] $QtInstallPath64 = "C:\Qt\5.15.2",
[string] $QtInstallPath64 = "C:\Qt\6.2.3",
[string] $QtCompile32 = "msvc2019",
[string] $QtCompile64 = "msvc2019_64",
[string] $AsioSDKName = "asiosdk_2.3.3_2019-06-14",
Expand Down

0 comments on commit 39d3196

Please sign in to comment.