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

Enforce XCB within code #13286

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

JoshuaVandaele
Copy link
Contributor

This moves the declaration of env QT_QPA_PLATFORM=xcb from the desktop file/flatpak args to DolphinQt's Main.cpp.

This is particularly useful for users attempting to launch dolphin from the command line by launching the dolphin-emu executable.

@jordan-woyak
Copy link
Member

Sounds good to me.

Copy link
Member

@dreamsyntax dreamsyntax left a comment

Choose a reason for hiding this comment

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

I'm mixed on this, but seeing as its been years... I don't think this is a crazy thing to do for now. Whenever proper wayland support is added we can remove this.

// For more information: https://bugs.dolphin-emu.org/issues/11807
const char* current_qt_platform = getenv("QT_QPA_PLATFORM");
const bool replace_qt_platform =
(current_qt_platform && strcasecmp(current_qt_platform, "wayland") == 0);
Copy link
Member

Choose a reason for hiding this comment

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

Minor nitpick, but I don't see the point to bother comparing for wayland since with the current configuration we force this env even on x11.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I preferred not to force a specific value on the user except in the case of the known broken Wayland setup, in case the user explicitly choose other options like minimal, offscreen, VNC, etc.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants