UI: Remove x11info dependency#4352
Merged
Merged
Conversation
WizardCM
added
kind/cleanup
Member
|
Haven't tested, but the code looks good. Nice cleanup. |
Member
|
To clarify, The Qt Company has said that Qt X11 Extras may be_ re-added to Qt6 at some point, but they haven't made any commitments about it or mentioned a specific release milestone. So if we can avoid relying on it, that's probably for the better. Would be even better if we could avoid using private functions, but at least that will work across Qt5 and Qt6 for now. Looks good to me at a glance, aside from merge conflicts. Could always use additional testing on Linux. |
This moves X11 platform to the qt private functions, as x11info was removed from Qt6 so this is required for a clean Qt5/6 transition. This is the implementation of x11info::getdisplay so it should still work on older platforms. This "API" doesnt really guarantee anything though. Also clean up wayland only bits as we use them for all windowing systems now, and the name of the native pointer we want is the same on both platforms for now.
kkartaltepe
force-pushed
the
remove-x11info
branch
from
March 16, 2021 19:45
a3859a0 to
0f6d812
Compare
Collaborator
Author
|
Updated to fix the merge conflict. |
Member
|
@GeorgesStavracas let me know if you test this patch. |
Member
|
Tested on Ubuntu 20.04 and Arch, it built and ran just fine:
|
6 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
This moves X11 platform to the qt private functions, as x11info was
removed from Qt6 so this is required for a clean Qt5/6 transition.
This is the implementation of x11info::getdisplay so it should still
work on older platforms. This "API" doesnt really guarantee anything
though.
Also clean up wayland only bits as we use them for all windowing systems
now, and the name of the native pointer we want is the same on both
platforms for now.
Motivation and Context
x11info was removed from Qt6 so this is required for a clean Qt5/6 transition.
How Has This Been Tested?
X11 still runs with this change on Qt 5.15.2.
Types of changes
Checklist: