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.

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

Build: Fix windows for qt6.8.1 #3451

Merged
merged 3 commits into from
Dec 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/autobuild/windows.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ $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"
$Msvc64Version = "win64_msvc2019_64"
$Msvc64Version = "win64_msvc2022_64"
$JomVersion = "1.1.2"

# Compose JACK download urls
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/autobuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion COMPILING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand Down
4 changes: 2 additions & 2 deletions windows/deploy_windows.ps1
Original file line number Diff line number Diff line change
@@ -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",
ann0see marked this conversation as resolved.
Show resolved Hide resolved
[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
Expand Down