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

cmake: Remove more Qt 5 code #10606

Merged
merged 1 commit into from Apr 30, 2024
Merged

Conversation

RytoEX
Copy link
Member

@RytoEX RytoEX commented Apr 26, 2024

Description

Qt Gui virtualkeyboard plugin was removed in Qt 6.x.
Qt Network Bearer Management was removed in Qt 6.0.
Qt Multimedia mediaservice and audio plugins were removed in Qt 6.x.

Motivation and Context

We don't support building with Qt 5 anymore, so we can remove Qt5-isms.

https://doc.qt.io/qt-5/bearer-management.html
qt/qtmultimedia@9814896
qt/qtmultimedia@762eff8
qt/qtmultimedia@b4d331d
https://doc.qt.io/qt-5/qtvirtualkeyboard-deployment-guide.html
https://doc.qt.io/qt-6/qtvirtualkeyboard-deployment-guide.html

How Has This Been Tested?

Tested locally on Windows 11.

Types of changes

  • Code cleanup (non-breaking change which makes code smaller or more readable)

Checklist:

  • My code has been run through clang-format.
  • I have read the contributing document.
  • My code is not on the master branch.
  • The code has been tested.
  • All commit messages are properly formatted and commits squashed where appropriate.
  • I have included updates to all appropriate documentation.

Qt Gui virtualkeyboard plugin was removed in Qt 6.x.
Qt Network Bearer Management was removed in Qt 6.0.
Qt Multimedia mediaservice and audio plugins were removed in Qt 6.x.
@RytoEX RytoEX added the Code Cleanup Non-breaking change which makes code smaller or more readable label Apr 26, 2024
@RytoEX RytoEX requested a review from PatTheMav April 26, 2024 19:54
@RytoEX RytoEX self-assigned this Apr 26, 2024
@RytoEX RytoEX added this to the OBS Studio (Next Version) milestone Apr 30, 2024
@RytoEX RytoEX merged commit 649c62c into obsproject:master Apr 30, 2024
14 checks passed
@RytoEX RytoEX deleted the remove-more-qt5-stuff branch April 30, 2024 16:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code Cleanup Non-breaking change which makes code smaller or more readable
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants