[macOS] Bump qtbase to 6.10 for macOS 26.5#4880
Open
sharder996 wants to merge 10 commits into
Open
Conversation
sharder996
force-pushed
the
kaizen/update-qt
branch
2 times, most recently
from
a36eeec to
06f342a
Compare
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #4880 +/- ##
=======================================
Coverage 87.79% 87.79%
=======================================
Files 269 269
Lines 14636 14636
=======================================
Hits 12848 12848
Misses 1788 1788 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
sharder996
force-pushed
the
kaizen/update-qt
branch
from
06f342a to
9b63dd3
Compare
sharder996
changed the title
Collaborator
Author
|
Requesting a review from @xmkg since you have an M2 Mac that can verify the build failures with the latest version of macOS. |
7 tasks
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
This PR updates the vcpkg submodule which uses a newer version of qtbase which includes a fix for QTBUG-145239.patch. This patch is not yet available in a vcpkg release so the most recent commit ATOW is used.
The latest macOS update for xcode manifests this issue the newer SDK ships a version of Clang that reports
__has_builtin(__yield)as true on Apple Silicon, but__yield()still requires<arm_acle.h>for its declaration. Qt 6.9.1'sqyieldcpu.hhits this path first, causing a fatal-Werror,-Wimplicit-function-declarationerror during the bootstrap build ofqtbase. On the latest version of macOS, Multipass fails to build.The newer version of Qt has a few API changes which necessitate a few changes in the tests. I also update some regex strings to be more compliant with macOS.
Additional updates:
Bad snapcraft.yaml contenterror which has plaguing CI for some time with Snap buildssnapcraft.yaml