summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2023-05-02 08:12:57 -0700
committerThiago Macieira <thiago.macieira@intel.com>2023-05-02 13:26:41 -0700
commitf8e0c3aeac41bfb3d6111219f467032451415b39 (patch)
treeb8d5515d330a094306ff87eab81e2c74e23678d4
parent6a4e8ce18bb2659b5a85c1a1ccf4c1b8631ea45f (diff)
downloadqtwayland-f8e0c3aeac41bfb3d6111219f467032451415b39.tar.gz
QWaylandDisplay: suppress warning about mixing QByteArray & QString
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 <davidedmundson@kde.org>
-rw-r--r--src/client/qwaylanddisplay.cpp2
1 files changed, 1 insertions, 1 deletions
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;
}