Skip to content

Comments

Build logic: Add Qt6 compatibility#2328

Merged
hoffie merged 7 commits intojamulussoftware:masterfrom
hoffie:build-Qt6-compat
Feb 2, 2022
Merged

Build logic: Add Qt6 compatibility#2328
hoffie merged 7 commits intojamulussoftware:masterfrom
hoffie:build-Qt6-compat

Conversation

@hoffie
Copy link
Member

@hoffie hoffie commented Jan 31, 2022 •
edited
Loading

Short description of changes

This PR makes the (auto)build handling ready for Qt6. In detail:

  • Autobuild: Mac: Add >=Qt6.2 bin path support
  • Build: Build nsProcess as 32-bit without Qt
  • Build: Split Qt/Non-Qt build env setup on Windows
  • Build: Permit different Qt versions for 32/64bit Windows
  • Build: Allow different Xcode versions per target
  • Build: Document dmgbuild as reason for staying on macOS 10.15

Context: Fixes an issue?

Qt6 support, see #2299 for details.

Does this change need documentation? What needs to be documented and how?

No.

Status of this Pull Request

Ready, I'm not planning further changes right now.

What is missing until this pull request can be merged?

  • Reviews: I suggest reviewing by commit, not (only) by full diff. I have added explanations to most of the commits. IMPORTANT: Do not squash.

Checklist

  • I've verified that this Pull Request follows the general code principles
  • I tested my code and it does what I want
  • My code follows the style guide
  • I waited some time after this Pull Request was opened and all GitHub checks completed without errors.
  • I've filled all the content above

@hoffie hoffie added this to the Release 3.9.0 milestone Jan 31, 2022
This was referenced Jan 31, 2022
Merged
Merged
@hoffie hoffie changed the title (Auto)build: Add Qt6 compatibility Build logic: Add Qt6 compatibility Jan 31, 2022
@hoffie
Copy link
Member Author

hoffie commented Feb 1, 2022

I initially targeted all the Qt6 stuff for 3.9.0, but looking over the diff it might be safe to merge before 3.8.2rc1? What do others think?

@pljones
Copy link
Collaborator

pljones commented Feb 2, 2022

I've no particular objection - albeit we've entered the beta cycle, so it's cutting down the test period for the new style of building.

@hoffie hoffie requested a review from softins February 2, 2022 11:12
softins
softins approved these changes Feb 2, 2022
View reviewed changes
Copy link
Member

@softins softins left a comment

Choose a reason for hiding this comment

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

All looks good to me. I haven't run it, but the CI looks happy.

I initially targeted all the Qt6 stuff for 3.9.0, but looking over the diff it might be safe to merge before 3.8.2rc1? What do others think?

As this is just improving the build process, I would be happy to merge it. I wouldn't want to add the code changes before 3.8.2, but I don't think you were suggesting that.

@hoffie hoffie modified the milestones: Release 3.9.0, Release 3.8.2 Feb 2, 2022
hoffie and others added 7 commits February 2, 2022 14:04
@hoffie
Build: Document dmgbuild as reason for staying on macOS 10.15
c8644f8
@hoffie
Build: Allow different Xcode versions per target
550510f 
This updates the Github Autobuild workflow to make the Xcode version
configurable through the build matrix. This helps when different macOS
targets should be built by different Xcode versions.
@hoffie
Build: Permit different Qt versions for 32/64bit Windows
30f638a
@hoffie
Build: Split Qt/Non-Qt build env setup on Windows
12a4662
@softins @hoffie
Build: Build nsProcess as 32-bit without Qt
fa7d79e 
Co-authored-by: Christian Hoffmann <[email protected]>
@hoffie
Autobuild: Mac: Add >=Qt6.2 bin path support
875fd92 
With Qt 6.2 the binary location path changed from `clang_64` to `macos`.
Therefore, check both places now to support the full range of relevant
Qt releases.
@hoffie
ChangeLog: Add jamulussoftware#2328 (Qt6 build logic compatibility)
f454dab
@hoffie
Copy link
Member Author

hoffie commented Feb 2, 2022

Alright. I've just added a commit to add a Changelog entry and will merge today when CI is green again.

@hoffie hoffie merged commit f56d8be into jamulussoftware:master Feb 2, 2022
@hoffie hoffie deleted the build-Qt6-compat branch March 19, 2022 20:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pljones pljones pljones approved these changes

@softins softins softins approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

Release 3.8.2

Development

Successfully merging this pull request may close these issues.

3 participants

@hoffie @pljones @softins