From ddb50a6cbfb2d9c5a69fc28d99bff8930dc731df Mon Sep 17 00:00:00 2001 From: Peter L Jones Date: Sun, 29 Dec 2024 12:58:00 +0000 Subject: [PATCH 1/3] Build: Bump Qt6 from 6.7.3 to 6.8.1 --- .github/autobuild/windows.ps1 | 2 +- .github/workflows/autobuild.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/autobuild/windows.ps1 b/.github/autobuild/windows.ps1 index a0825c9ad1..e018e6a9bf 100644 --- a/.github/autobuild/windows.ps1 +++ b/.github/autobuild/windows.ps1 @@ -49,7 +49,7 @@ $DownloadCacheDir = 'C:\AutobuildCache' # The following version pinnings are semi-automatically checked for # updates. Verify .github/workflows/bump-dependencies.yaml when changing those manually: $Qt32Version = "5.15.2" -$Qt64Version = "6.7.3" +$Qt64Version = "6.8.1" $AqtinstallVersion = "3.1.21" $JackVersion = "1.9.22" $Msvc32Version = "win32_msvc2019" diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index d603bfea57..793a79174f 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -227,7 +227,7 @@ jobs: - config_name: MacOS (artifacts) target_os: macos building_on_os: macos-14 - base_command: QT_VERSION=6.7.3 SIGN_IF_POSSIBLE=1 TARGET_ARCHS="x86_64 arm64" ./.github/autobuild/mac.sh + base_command: QT_VERSION=6.8.1 SIGN_IF_POSSIBLE=1 TARGET_ARCHS="x86_64 arm64" ./.github/autobuild/mac.sh # Disable CodeQL on mac as it interferes with signing the binaries (signing hangs, see #2563 and #2564) run_codeql: false # Latest Xcode which runs on macos-14: From 5679023567a7f8de74bafe8465de9944ab8a7226 Mon Sep 17 00:00:00 2001 From: Peter L Jones Date: Thu, 26 Dec 2024 16:23:04 +0000 Subject: [PATCH 2/3] Bump MSVC to 2022 for Qt 6.8.1 --- .github/autobuild/windows.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/autobuild/windows.ps1 b/.github/autobuild/windows.ps1 index e018e6a9bf..b21ab48759 100644 --- a/.github/autobuild/windows.ps1 +++ b/.github/autobuild/windows.ps1 @@ -53,7 +53,7 @@ $Qt64Version = "6.8.1" $AqtinstallVersion = "3.1.21" $JackVersion = "1.9.22" $Msvc32Version = "win32_msvc2019" -$Msvc64Version = "win64_msvc2019_64" +$Msvc64Version = "win64_msvc2022_64" $JomVersion = "1.1.2" # Compose JACK download urls From f113ef1b96997bf279ad348e2c0f716c609839b4 Mon Sep 17 00:00:00 2001 From: Peter L Jones Date: Thu, 26 Dec 2024 16:47:19 +0000 Subject: [PATCH 3/3] And bump Qt and MSVC in randomly located script --- COMPILING.md | 2 +- windows/deploy_windows.ps1 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/COMPILING.md b/COMPILING.md index 31eb6b4acd..eacc929cfc 100644 --- a/COMPILING.md +++ b/COMPILING.md @@ -78,7 +78,7 @@ Download and install Qt e.g via the [official open source installer](https://www **Note:** - Use the free GPLv2 license for Open Source development, not the commercial "universal installer" -- Select Components during installation: Expand the Qt section, find the matching version, preferrably **Qt 5.15.2**, and add the compiler components for your compiler, e.g., `MSVC 2019 32-bit/64-bit` for Visual Studio 2019 +- Select Components during installation: Expand the Qt section, find the matching version. To match the Github builds, you will need to check the versions in `windows/deploy_windows.ps2`. This gives both the Qt and MSVC versions (e.g. 6.8.1 and msvc2022_64 for a 64bit release). If you build with *JACK* support, install JACK via choco: `choco install --no-progress -y jack` diff --git a/windows/deploy_windows.ps1 b/windows/deploy_windows.ps1 index 54cbd13df5..004d9a25f4 100644 --- a/windows/deploy_windows.ps1 +++ b/windows/deploy_windows.ps1 @@ -1,9 +1,9 @@ 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.8.1", [string] $QtCompile32 = "msvc2019", - [string] $QtCompile64 = "msvc2019_64", + [string] $QtCompile64 = "msvc2022_64", # Important: # - Do not update ASIO SDK without checking for license-related changes. # - Do not copy (parts of) the ASIO SDK into the Jamulus source tree without