35 lines
1.7 KiB
Diff
35 lines
1.7 KiB
Diff
From: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
|
|
Date: Mon, 20 Nov 2023 01:57:44 +0000
|
|
Subject: 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.
|
|
---
|
|
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 b39b3b4..a217719 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
|