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

Replace deprecated Q_OS_MACX with Q_OS_MACOS #3227

Merged
merged 1 commit into from
Feb 17, 2024

Conversation

softins
Copy link
Member

@softins softins commented Feb 7, 2024

Short description of changes

This PR replaces all instances of Q_OS_MACX with Q_OS_MACOS

CHANGELOG: Build: Replace deprecated Q_OS_MACX with Q_OS_MACOS (Jamulus now requires building with Qt >= 5.7.1)

Context: Fixes an issue?

The #define of Q_OS_MACOS was introduced in Qt 5.7.1, to replace Q_OS_MACX. The latter was still defined for backward-compatibility. Starting with Qt 6.5.2, using Q_OS_MACX produces a deprecation warning, for example:

In file included from ../src/settings.cpp:25:
In file included from ../src/settings.h:36:
../src/client.h:47:20: warning: macro 'Q_OS_MACX' has been marked as deprecated: use Q_OS_MACOS instead [-Wdeprecated-pragma]
#    if ( defined( Q_OS_MACX ) ) && !defined( JACK_REPLACES_COREAUDIO )
                   ^
/usr/local/opt/qt/6.6.1/macos/lib/QtCore.framework/Headers/qsystemdetection.h:167:65: note: macro marked 'deprecated' here
#    pragma clang deprecated(Q_OS_MACX, "use Q_OS_MACOS instead")
                                                                ^
1 warning generated.

A similar change was made in Qt itself at https://codereview.qt-project.org/c/qt/qtbase/+/307095/2

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

Probably not.

Status of this Pull Request

Ready to merge,

What is missing until this pull request can be merged?

Just review

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

Copy link
Member

@ann0see ann0see left a comment

Choose a reason for hiding this comment

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

Same comment as in other PR: this will drop support for old Qt builds and should at least be mentioned in the change log

@softins
Copy link
Member Author

softins commented Feb 12, 2024

Same comment as in other PR: this will drop support for old Qt builds and should at least be mentioned in the change log

OK, I've added that to the CHANGELOG entry in the initial description. I doubt anybody is still building with a version of Qt older than 5.7.1. CentOS 7 uses 5.9.7, Ubuntu 18.04 uses 5.9.5, Debian 10 uses 5.11.3.

@softins softins requested a review from ann0see February 14, 2024 17:55
@ann0see ann0see merged commit cf5bcd9 into jamulussoftware:main Feb 17, 2024
11 checks passed
@ann0see
Copy link
Member

ann0see commented Feb 17, 2024

I changed the changelog entry slightly.

@softins softins deleted the use-macos-define branch March 4, 2024 12:16
@pljones pljones added this to the Release 3.11.0 milestone Jul 28, 2024
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants