From 73012c6b87e4b43eab5490842ef0815a57f3451f Mon Sep 17 00:00:00 2001 From: Debian Qt/KDE Maintainers Date: Sun, 14 Jul 2024 18:35:58 +0300 Subject: [PATCH] use wayland platform plugin on GNOME wayland sessions by default Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=dda7dab8274991e4 Last-Update: 2022-10-16 Qt wayland platform plugin has improved quite a lot and it is now pretty much usable on Gnome. It also improves user experience a lot on HiDPI displays. Gbp-Pq: Name gnome_wayland.diff --- src/gui/kernel/qguiapplication.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index c7ff2a6da..501007cac 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -1412,14 +1412,7 @@ void QGuiApplicationPrivate::createPlatformIntegration() if (sessionType == QByteArrayLiteral("x11") && !platformName.contains(QByteArrayLiteral("xcb"))) { platformName = QByteArrayLiteral("xcb"); } else if (sessionType == QByteArrayLiteral("wayland") && !platformName.contains(QByteArrayLiteral("wayland"))) { - QByteArray currentDesktop = qgetenv("XDG_CURRENT_DESKTOP").toLower(); - QByteArray sessionDesktop = qgetenv("XDG_SESSION_DESKTOP").toLower(); - if (currentDesktop.contains("gnome") || sessionDesktop.contains("gnome")) { - qInfo() << "Warning: Ignoring XDG_SESSION_TYPE=wayland on Gnome." - << "Use QT_QPA_PLATFORM=wayland to run on Wayland anyway."; - } else { - platformName = QByteArrayLiteral("wayland"); - } + platformName = QByteArrayLiteral("wayland"); } } #ifdef QT_QPA_DEFAULT_PLATFORM_NAME -- 2.30.2