diff --git a/autobuild/windows/autobuild_windowsinstaller_1_prepare.ps1 b/autobuild/windows/autobuild_windowsinstaller_1_prepare.ps1 index a57254484d..ddab188895 100644 --- a/autobuild/windows/autobuild_windowsinstaller_1_prepare.ps1 +++ b/autobuild/windows/autobuild_windowsinstaller_1_prepare.ps1 @@ -40,8 +40,9 @@ Function Install-Qt { $QtDir = 'C:\Qt' $ChocoCacheDir = 'C:\ChocoCache' +# 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" $Msvc32Version = "win32_msvc2019" diff --git a/autobuild/windows/autobuild_windowsinstaller_2_build.ps1 b/autobuild/windows/autobuild_windowsinstaller_2_build.ps1 index 960aed3ecf..7ea40e399d 100644 --- a/autobuild/windows/autobuild_windowsinstaller_2_build.ps1 +++ b/autobuild/windows/autobuild_windowsinstaller_2_build.ps1 @@ -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 ( !$? ) { diff --git a/windows/deploy_windows.ps1 b/windows/deploy_windows.ps1 index d82cdeb108..275bf0ba9d 100644 --- a/windows/deploy_windows.ps1 +++ b/windows/deploy_windows.ps1 @@ -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",