Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve Qt5 linking on macOS #381

Merged
merged 2 commits into from
Feb 14, 2024

Conversation

HaHeho
Copy link
Contributor

@HaHeho HaHeho commented Dec 20, 2023

I think this is cleaner to temporarily link Qt5 from homebrew when Qt6 is also installed, with the main reason that the brew link configuration does not need to be corrected and reverted to Qt6 after building.

The GitHub Actions currently fail due to an outdated macOS+Xcode configuration as described in #380. I've manually rerun a newer configuration, which was built successfully.

@mgeier
Copy link
Member

mgeier commented Dec 23, 2023

Thanks! This looks good to me, can you please rebase? Now CI should pass.

@HaHeho
Copy link
Contributor Author

HaHeho commented Dec 24, 2023

Thanks! This looks good to me, can you please rebase? Now CI should pass.

Done. Everything passed.

@mgeier
Copy link
Member

mgeier commented Feb 3, 2024

Sorry, can you please re-base again?

Some commits are now already in the master branch, so they should be removed here.

@HaHeho
Copy link
Contributor Author

HaHeho commented Feb 13, 2024

Sorry, can you please re-base again?

Some commits are now already in the master branch, so they should be removed here.

Not sure what happened there. Rebased now against latest and all tests pass.

@mgeier mgeier merged commit 7da39af into SoundScapeRenderer:master Feb 14, 2024
11 checks passed
@mgeier
Copy link
Member

mgeier commented Feb 14, 2024

Thanks!

@HaHeho HaHeho deleted the macOS-qt-linking branch February 15, 2024 14:46
@mgeier mgeier mentioned this pull request Oct 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants