From f8e0c3aeac41bfb3d6111219f467032451415b39 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 2 May 2023 08:12:57 -0700 Subject: QWaylandDisplay: suppress warning about mixing QByteArray & QString MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit src/client/qwaylanddisplay.cpp:627:36: required from here qlist.h:907:20: warning: ‘bool QByteArray::operator==(const QString&) const’ is deprecated: Use fromUtf8, QStringLiteral, or QLatin1StringView [-Wdeprecated-declarations] Pick-to: 6.5 Change-Id: Ieab617d69f3b4b54ab30fffd175b5c4e76fdda4d Reviewed-by: David Edmundson --- src/client/qwaylanddisplay.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp index 71d5025c..b7e212ab 100644 --- a/src/client/qwaylanddisplay.cpp +++ b/src/client/qwaylanddisplay.cpp @@ -623,7 +623,7 @@ void QWaylandDisplay::registry_global(uint32_t id, const QString &interface, uin { struct ::wl_registry *registry = object(); - static QByteArrayList interfaceBlacklist = qgetenv("QT_WAYLAND_DISABLED_INTERFACES").split(','); + static QStringList interfaceBlacklist = qEnvironmentVariable("QT_WAYLAND_DISABLED_INTERFACES").split(u','); if (interfaceBlacklist.contains(interface)) { return; } -- cgit v1.2.1