2ffd05e2cb
The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/qt5-qtbase#9d109333a34e8b362f4f72f82797457ee9119230
21 lines
1.2 KiB
Diff
21 lines
1.2 KiB
Diff
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
|
|
index b8bfad4f16..676fdfad5e 100644
|
|
--- a/src/gui/kernel/qguiapplication.cpp
|
|
+++ b/src/gui/kernel/qguiapplication.cpp
|
|
@@ -1376,14 +1376,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
|