qt6-qtbase/qtbase-use-wayland-on-gnome...

20 lines
1005 B
Diff
Raw Normal View History

2021-01-22 08:45:28 +00:00
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
2021-05-06 18:03:08 +00:00
index 08a00d82..f555fb4f 100644
2021-01-22 08:45:28 +00:00
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
2021-05-06 18:03:08 +00:00
@@ -1411,13 +1411,7 @@ void QGuiApplicationPrivate::createPlatformIntegration()
bool isGnome = false;
2021-01-22 08:45:28 +00:00
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();
2021-05-06 18:03:08 +00:00
- isGnome = currentDesktop.contains("gnome") || sessionDesktop.contains("gnome");
- if (isGnome)
2021-01-22 08:45:28 +00:00
- preferredPlatformOrder.append(waylandPlatformName);
2021-05-06 18:03:08 +00:00
- else
2021-01-22 08:45:28 +00:00
- preferredPlatformOrder.prepend(waylandPlatformName);
+ preferredPlatformOrder.prepend(waylandPlatformName);
if (defaultIsWayland)
platformName.clear();