From f8b85edd0cdf87c9f9a8507258b7989023d028bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Vanda=C3=ABle?= Date: Mon, 4 Aug 2025 19:34:31 +0200 Subject: Qt: Better wayland detection to enforce xcb 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/ --- Source/Core/Common/StringUtil.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'Source/Core/Common/StringUtil.cpp') diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp index 935db75d2f..bfd03be9ff 100644 --- a/Source/Core/Common/StringUtil.cpp +++ b/Source/Core/Common/StringUtil.cpp @@ -669,6 +669,22 @@ bool CaseInsensitiveEquals(std::string_view a, std::string_view b) a, b, [](char ca, char cb) { return Common::ToLower(ca) == Common::ToLower(cb); }); } +bool CaseInsensitiveContains(std::string_view haystack, std::string_view needle) +{ + if (needle.empty()) + return true; + + for (size_t i = 0; i + needle.size() <= haystack.size(); ++i) + { + if (std::ranges::equal(needle, haystack.substr(i, needle.size()), + [](char a, char b) { return Common::ToLower(a) == Common::ToLower(b); })) + { + return true; + } + } + return false; +} + bool CaseInsensitiveLess::operator()(std::string_view a, std::string_view b) const { return std::ranges::lexicographical_compare( -- cgit v1.2.3