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

macOS: Add more Q_OS_MACOS cond-compiles where appropriate #12663

Merged
merged 1 commit into from
Jan 28, 2024

Conversation

fwcd
Copy link
Member

@fwcd fwcd commented Jan 27, 2024

In preparation of iOS support, this turns a bunch of __APPLE__ cond-compiles into Q_OS_MACOS, since e.g. dark title bars or the migration from ~/Library/Application Support/... to ~/Library/Containers/... only affects macOS.

@daschuer
Copy link
Member

Q_OS_MACOS does only work if a Qt header has been included before. Is this always the case?

@fwcd
Copy link
Member Author

fwcd commented Jan 27, 2024

Yeah, this is why I added the #include <QtGlobal>, just to be on the safe side

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, Thank you.

@daschuer daschuer merged commit b131de5 into mixxxdj:2.4 Jan 28, 2024
14 checks passed
@fwcd fwcd added the ios label Jan 28, 2024
@fwcd fwcd deleted the qosmacos branch February 2, 2024 23:16
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.

2 participants