Skip to content

Commit fe88e3e

Browse files
authored
Merge pull request #3451 from jamulussoftware/fix-windows-for-qt6_8_1
Build: Fix windows for qt6.8.1
2 parents 4af2b5b + f113ef1 commit fe88e3e

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.github/autobuild/windows.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ $DownloadCacheDir = 'C:\AutobuildCache'
4949
# The following version pinnings are semi-automatically checked for
5050
# updates. Verify .github/workflows/bump-dependencies.yaml when changing those manually:
5151
$Qt32Version = "5.15.2"
52-
$Qt64Version = "6.7.3"
52+
$Qt64Version = "6.8.1"
5353
$AqtinstallVersion = "3.1.21"
5454
$JackVersion = "1.9.22"
5555
$Msvc32Version = "win32_msvc2019"
56-
$Msvc64Version = "win64_msvc2019_64"
56+
$Msvc64Version = "win64_msvc2022_64"
5757
$JomVersion = "1.1.2"
5858

5959
# Compose JACK download urls

.github/workflows/autobuild.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ jobs:
227227
- config_name: MacOS (artifacts)
228228
target_os: macos
229229
building_on_os: macos-14
230-
base_command: QT_VERSION=6.7.3 SIGN_IF_POSSIBLE=1 TARGET_ARCHS="x86_64 arm64" ./.github/autobuild/mac.sh
230+
base_command: QT_VERSION=6.8.1 SIGN_IF_POSSIBLE=1 TARGET_ARCHS="x86_64 arm64" ./.github/autobuild/mac.sh
231231
# Disable CodeQL on mac as it interferes with signing the binaries (signing hangs, see #2563 and #2564)
232232
run_codeql: false
233233
# Latest Xcode which runs on macos-14:

COMPILING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Download and install Qt e.g via the [official open source installer](https://www
7878

7979
**Note:**
8080
- Use the free GPLv2 license for Open Source development, not the commercial "universal installer"
81-
- 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
81+
- 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).
8282

8383
If you build with *JACK* support, install JACK via choco: `choco install --no-progress -y jack`
8484

windows/deploy_windows.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
param (
22
# Replace default path with system Qt installation folder if necessary
33
[string] $QtInstallPath32 = "C:\Qt\5.15.2",
4-
[string] $QtInstallPath64 = "C:\Qt\5.15.2",
4+
[string] $QtInstallPath64 = "C:\Qt\6.8.1",
55
[string] $QtCompile32 = "msvc2019",
6-
[string] $QtCompile64 = "msvc2019_64",
6+
[string] $QtCompile64 = "msvc2022_64",
77
# Important:
88
# - Do not update ASIO SDK without checking for license-related changes.
99
# - Do not copy (parts of) the ASIO SDK into the Jamulus source tree without

0 commit comments

Comments
 (0)