qt6-qtbase/qtbase-use-wayland-on-gnome.patch
2021-01-22 09:45:28 +01:00

23 lines
1.2 KiB
Diff

diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index c10b95e2..476e3d3b 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -1412,16 +1412,7 @@ void QGuiApplicationPrivate::createPlatformIntegration()
const bool defaultIsWayland = !defaultIsXcb && platformPluginBase.startsWith("wayland");
const QByteArray waylandPlatformName = defaultIsWayland ? platformName : "wayland";
if (hasWaylandDisplay || isWaylandSessionType) {
- const QByteArray currentDesktop = qgetenv("XDG_CURRENT_DESKTOP").toLower();
- const QByteArray sessionDesktop = qgetenv("XDG_SESSION_DESKTOP").toLower();
- const bool isGnome = currentDesktop.contains("gnome") || sessionDesktop.contains("gnome");
- if (isGnome) {
- qInfo() << "Warning: Ignoring WAYLAND_DISPLAY on Gnome."
- << "Use QT_QPA_PLATFORM=wayland to run on Wayland anyway.";
- preferredPlatformOrder.append(waylandPlatformName);
- } else {
- preferredPlatformOrder.prepend(waylandPlatformName);
- }
+ preferredPlatformOrder.prepend(waylandPlatformName);
if (defaultIsWayland)
platformName.clear();