piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-09-12 22:42:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

Qt: Better wayland detection to enforce xcb

Browse Source 
In certain cases, the platform can be "wayland-egl", "wayland-xcomposite", and other values for which I haven't found a full list yet. Instead of matching only "wayland", we now look for "wayland" anywhere in the `QT_QPA_PLATFORM` string in a case-insensitive manner.

Acknowledgements:
`CaseInsensitiveContains`' implementation was heavily inspired by GNU's non-standard glibc `strcasestr` function, which can be found here licensed under GPLv2 or later: https://ftp.gnu.org/gnu/libc/
This commit is contained in:
Joshua Vandaële
2025-08-04 19:34:31 +02:00
parent 6ca486ffb2
commit f8b85edd0c
4 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/DolphinQt/Main.cpp
View File

@ -23,6 +23,7 @@
#include "Common/Config/Config.h"
#include "Common/MsgHandler.h"
#include "Common/ScopeGuard.h"
#include "Common/StringUtil.h"
#include "Core/Boot/Boot.h"
#include "Core/Config/MainSettings.h"
@ -152,8 +153,8 @@ int main(int argc, char* argv[])
// from happening.
// 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);
const bool replace_qt_platform = current_qt_platform != nullptr &&
Common::CaseInsensitiveContains(current_qt_platform, "wayland");
setenv("QT_QPA_PLATFORM", "xcb", replace_qt_platform);
#endif