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

ConfigObject: Find resource path on iOS #12687

Merged
merged 2 commits into from Jan 29, 2024

Conversation

fwcd
Copy link
Member

@fwcd fwcd commented Jan 29, 2024

This updates the qResourcePath logic to handle iOS app bundles (which use a flat directory layout with resources at the top level, see the Apple docs).

Copy link
Member

@daschuer daschuer left a comment

Choose a reason for hiding this comment

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

LGTM,

Just to clarify: this is against the main branch.
Will you now put everything iOS related there? That is OK. Just asking, because we have put similar low risk PRs to 2.4.

@fwcd
Copy link
Member Author

fwcd commented Jan 29, 2024

No strong feelings here. The larger iOS patches will definitely go to main (e.g. #12690). But if 2.4 is fine, let's do that (this likely won't produce a conflict either way).

@fwcd fwcd changed the base branch from main to 2.4 January 29, 2024 17:38
src/preferences/configobject.cpp Outdated Show resolved Hide resolved
Co-authored-by: JoergAtGithub <64457745+JoergAtGithub@users.noreply.github.com>
@JoergAtGithub
Copy link
Member

LGTM! Thank you!

Please target future iOS PRs to main, as 2.4 becomes a bugfix only branch soon.

@JoergAtGithub JoergAtGithub merged commit ef6e366 into mixxxdj:2.4 Jan 29, 2024
14 checks passed
@fwcd fwcd deleted the resource-path-ios branch January 29, 2024 23:39
@fwcd fwcd mentioned this pull request Jan 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants