Skip to content

Conversation

@hebasto
Copy link
Member

@hebasto hebasto commented Nov 19, 2021

This PR is a follow up of #23489.

The initial support of macOS Big Sur by Qt was pretty broken. Fixup commits were submitted into the dev branch, and backported to 5.12 and 5.15 branches.

Those fixups were released with the Qt 5.12.11, but, unfortunately, will be never (?) released as Qt 5.15.3 (for license issues, I guess).

Therefore, bumping Qt version from 5.12.11 to 5.15.2 brings a regression into rendering of some widgets in macOS BigSur.

This PR fixes this regression.

See:

@DrahtBot
Copy link
Contributor

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

Reviewers, this pull request conflicts with the following ones:

  • #23495 (build: Bump Fontconfig version up to 2.12.6 by hebasto)
  • #22708 (build, qt: Add Wayland support for Linux builds with depends by hebasto)
  • #22555 (build: Fix make apk for Android w/ non-default SOURCES_PATH in depends by hebasto)
  • #22552 (build: Improve depends build system robustness by hebasto)
  • #22487 (build, qt: Fix cross-compiling detection on M1-based macOS (aarch64) by hebasto)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

Copy link
Contributor

@jarolrod jarolrod left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Concept ACK, This does in fact fix the regression. It should be documented what the regression is:

Master Depends Build (Qt 5.12)
bigsur-regression-master

PR23489 Depends Build (Qt 5.15)
bigsur-regression-qt5 15pr

This PR Depends Build (Qt 5.15)
bigsur-regression-pr23556

@fanquake
Copy link
Member

Cherry-picked into #23489.

@fanquake fanquake closed this Nov 21, 2021
@fanquake fanquake mentioned this pull request Nov 21, 2021
@hebasto hebasto deleted the 211119-macstyle branch November 21, 2021 07:42
@bitcoin bitcoin locked and limited conversation to collaborators Nov 21, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants