Update to upstream 2.5 environment and Qt 6 #33
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fwcd
added
enhancement
Merged
|
Given that upstream seems to be moving towards Qt 6 (see mixxxdj/vcpkg#73), maintaining the cross-build will likely become a larger endeavor. Hopefully Apple Silicon runners, which would let us compile Qt natively, will be available by then (see also #15). |
fwcd
changed the title
vcpkg to upstream 2.5 branchvcpkg to upstream 2.5 branch (including Qt 6)
fwcd
changed the title
vcpkg to upstream 2.5 branch (including Qt 6)
|
We could also investigate keeping the Qt 5 build around (e.g. on a separate branch or simply in a separate GitHub Actions matrix configuration, with a flag in the |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The new vcpkg environment replaces the patched Qt 5.12 build with Qt 6 (mixxxdj/vcpkg@875cb10).
Marked as a draft for now since the
mixxxbranch requires some patching again. The branch currently is a rebased version ofdaschuer:qt6_switch, namelyfwcd:qt6. mixxxdj/mixxx#11863 unfortunately doesn't seem to be sufficient, just like the currentmain(at the time of writing) it fails already during the configure phase, so we will have to wait for the corresponding patches to be merged tomain.