Skip to content

Remove X11Extras#4358

Merged
jp9000 merged 2 commits into
obsproject:masterfrom
RytoEX:remove-x11extras
Mar 17, 2021
Merged

Remove X11Extras#4358
jp9000 merged 2 commits into
obsproject:masterfrom
RytoEX:remove-x11extras

Conversation

@RytoEX

@RytoEX RytoEX commented Mar 17, 2021

Copy link
Copy Markdown
Member

Description

Qt5X11Extras (QX11Info) was added in 762983b, but it doesn't seem to actually be used. Qt6 doesn't yet ship X11Extras, so let's remove it.

#3177 added Qt5X11Extras as a dependency, though doesn't actually seem to use classes or functions from it. This was to work around obsproject/obs-browser#219, but that appears to have been resolved by updating to CEF 4280+. Native dialogs were reinstated in 58497e5 (#4155), but we still have Qt5X11Extras as a dependency. Since X11Extras is not currently part of Qt6, and it has no expected ship date, and we aren't using it, let's remove it.

Pinging @cg2121 and @GeorgesStavracas since they authored the PRs linked above.

https://doc.qt.io/qt-5/qtx11extras-module.html
https://doc.qt.io/qt-5/qx11info.html

Motivation and Context

Less dependencies. Makes a future transition to Qt6 easier.

How Has This Been Tested?

Compiles on a Ubuntu 20.04 VM against Qt 5.12.8. Would appreciate more testing or review from people who use Linux regularly.

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.

RytoEX added 2 commits March 17, 2021 11:15
Qt5X11Extras (QX11Info) was added in
762983b, but it doesn't seem to
actually be used. Qt6 doesn't yet ship X11Extras, so let's remove it.
Qt5X11Extras (QX11Info) was added in
762983b, but it doesn't seem to
actually be used. Qt6 doesn't yet ship X11Extras, so let's remove it.
@RytoEX RytoEX added the kind/cleanup Non-breaking change which makes code smaller or more readable label Mar 17, 2021
@RytoEX
RytoEX requested a review from kkartaltepe March 17, 2021 17:17

@GeorgesStavracas GeorgesStavracas left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks good to me as well :)

@jp9000
jp9000 merged commit 4ed7cd4 into obsproject:master Mar 17, 2021
@RytoEX
RytoEX deleted the remove-x11extras branch March 17, 2021 19:49
@RytoEX

RytoEX commented Mar 17, 2021

Copy link
Copy Markdown
Member Author

@kkartaltepe @GeorgesStavracas
Thank you both for weighing in!

@RytoEX RytoEX added this to the OBS Studio 27.0 milestone Mar 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

kind/cleanup Non-breaking change which makes code smaller or more readable

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants