You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
33 lines
1.5 KiB
33 lines
1.5 KiB
From dacd0c6b3466258d175e7119a8e4836171400820 Mon Sep 17 00:00:00 2001
|
|
From: Jan Grulich <jgrulich@redhat.com>
|
|
Date: Wed, 26 Jul 2023 12:03:46 +0200
|
|
Subject: [PATCH 01/15] Use Wayland by default on GNOME
|
|
|
|
---
|
|
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 b39b3b4e5e..a217719ea8 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.41.0
|
|
|