Skip to content

Commit

Permalink
Autobuild: Windows: Build with Qt 6.2.2 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 Jan 30, 2022
1 parent 1411e16 commit f06a7d3
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
Expand Up @@ -29,14 +29,15 @@ if ( !$? )

echo "Get Qt 64 bit..."
# intermediate solution if the main server is down: append e.g. " -b https://mirrors.ocf.berkeley.edu/qt/" to the "aqt"-line below
aqt install-qt --outputdir C:\Qt windows desktop 5.15.2 win64_msvc2019_64
aqt install-qt --outputdir C:\Qt windows desktop 6.2.2 win64_msvc2019_64
if ( !$? )
{
throw "64bit Qt installation failed with exit code $LastExitCode"
}

echo "Get Qt 32 bit..."
# intermediate solution if the main server is down: append e.g. " -b https://mirrors.ocf.berkeley.edu/qt/" to the "aqt"-line below
# Qt6 does not provide 32bit binaries, so use latest Qt5 instead:
aqt install-qt --outputdir C:\Qt windows desktop 5.15.2 win32_msvc2019
if ( !$? )
{
Expand Down
4 changes: 2 additions & 2 deletions autobuild/windows/autobuild_windowsinstaller_2_build.ps1
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.2" -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.2"
}
if ( !$? )
{
Expand Down
2 changes: 1 addition & 1 deletion 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.2",
[string] $QtCompile32 = "msvc2019",
[string] $QtCompile64 = "msvc2019_64",
[string] $AsioSDKName = "asiosdk_2.3.3_2019-06-14",
Expand Down

0 comments on commit f06a7d3

Please sign in to comment.