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 Qt6 updates #410

Merged
merged 5 commits into from Nov 8, 2021
Merged

MacOS Qt6 updates #410

merged 5 commits into from Nov 8, 2021

Conversation

jhoyt4
Copy link
Contributor

@jhoyt4 jhoyt4 commented Nov 6, 2021

Fixes to get mythtv-master compiling with Qt6 on macOS

Checklist

Copy link
Contributor

@linuxdude42 linuxdude42 left a comment

Choose a reason for hiding this comment

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

Do these not work with Q_OBJECT, or you don't need the overhead?

@jhoyt4
Copy link
Contributor Author

jhoyt4 commented Nov 7, 2021

As far as I could tell, they did not work with Q_OBJECT - but I'm barely even a novice developing in QT, so I may have missed a better fix.

Copy link
Contributor

@linuxdude42 linuxdude42 left a comment

Choose a reason for hiding this comment

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

Looks good other than this one issue.

@linuxdude42 linuxdude42 merged commit fc08305 into MythTV:devel/qt6 Nov 8, 2021
linuxdude42 pushed a commit to linuxdude42/mythtv that referenced this pull request Nov 8, 2021
* OSX: Fix issue where QKeyCombination cannot be recast as int on QT6 only

* OSX: Fix issue where 'QString *' and 'const QString' cannot be compared

* OSX: In Qt6 OpenGL calls are now in their own Qt module QtOpenGL

* OSX: modify MacDockSettings, MacMainSettings, MacFloatSettings, and MacDesktopSettings to use Non-Qt Class translation in Qt6
@jhoyt4 jhoyt4 deleted the devel/qt6 branch November 8, 2021 14:29
linuxdude42 pushed a commit to linuxdude42/mythtv that referenced this pull request Nov 8, 2021
* OSX: Fix issue where QKeyCombination cannot be recast as int on QT6 only

* OSX: Fix issue where 'QString *' and 'const QString' cannot be compared

* OSX: In Qt6 OpenGL calls are now in their own Qt module QtOpenGL

* OSX: modify MacDockSettings, MacMainSettings, MacFloatSettings, and MacDesktopSettings to use Non-Qt Class translation in Qt6
linuxdude42 pushed a commit to linuxdude42/mythtv that referenced this pull request Nov 8, 2021
* OSX: Fix issue where QKeyCombination cannot be recast as int on QT6 only

* OSX: Fix issue where 'QString *' and 'const QString' cannot be compared

* OSX: In Qt6 OpenGL calls are now in their own Qt module QtOpenGL

* OSX: modify MacDockSettings, MacMainSettings, MacFloatSettings, and MacDesktopSettings to use Non-Qt Class translation in Qt6
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.

None yet

2 participants