Upstream now uses Wayland on GNOME by default
This commit is contained in:
parent
52af82532c
commit
08a0442b88
@ -12,9 +12,6 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
|
|||||||
|
|
||||||
|
|
||||||
# Upstreamable patches
|
# Upstreamable patches
|
||||||
# https://fedoraproject.org/wiki/Changes/Qt_Wayland_By_Default_On_Gnome
|
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1732129
|
|
||||||
Patch50: qtwayland-use-gnome-platform-theme-on-gnome-based-desktops.patch
|
|
||||||
|
|
||||||
|
|
||||||
# filter qml provides
|
# filter qml provides
|
||||||
|
@ -1,39 +0,0 @@
|
|||||||
diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp
|
|
||||||
index 97e0203c..5bee160a 100644
|
|
||||||
--- a/src/client/qwaylandintegration.cpp
|
|
||||||
+++ b/src/client/qwaylandintegration.cpp
|
|
||||||
@@ -99,20 +99,26 @@ public:
|
|
||||||
|
|
||||||
if (QGuiApplication::desktopSettingsAware()) {
|
|
||||||
const QByteArray desktopEnvironment = QGuiApplicationPrivate::platformIntegration()->services()->desktopEnvironment();
|
|
||||||
-
|
|
||||||
+ QList<QByteArray> gtkBasedEnvironments;
|
|
||||||
+ gtkBasedEnvironments << "GNOME"
|
|
||||||
+ << "X-CINNAMON"
|
|
||||||
+ << "UNITY"
|
|
||||||
+ << "MATE"
|
|
||||||
+ << "XFCE"
|
|
||||||
+ << "LXDE";
|
|
||||||
if (desktopEnvironment == QByteArrayLiteral("KDE")) {
|
|
||||||
#if QT_CONFIG(settings)
|
|
||||||
result.push_back(QStringLiteral("kde"));
|
|
||||||
#endif
|
|
||||||
- } else if (!desktopEnvironment.isEmpty() &&
|
|
||||||
- desktopEnvironment != QByteArrayLiteral("UNKNOWN") &&
|
|
||||||
- desktopEnvironment != QByteArrayLiteral("GNOME") &&
|
|
||||||
- desktopEnvironment != QByteArrayLiteral("UNITY") &&
|
|
||||||
- desktopEnvironment != QByteArrayLiteral("MATE") &&
|
|
||||||
- desktopEnvironment != QByteArrayLiteral("XFCE") &&
|
|
||||||
- desktopEnvironment != QByteArrayLiteral("LXDE"))
|
|
||||||
+ } else if (gtkBasedEnvironments.contains(desktopEnvironment)) {
|
|
||||||
+ // prefer the GTK3 theme implementation with native dialogs etc.
|
|
||||||
+ result.push_back(QStringLiteral("gtk3"));
|
|
||||||
+ // fallback to the generic Gnome theme if loading the GTK3 theme fails
|
|
||||||
+ result.push_back(QLatin1String(QGnomeTheme::name));
|
|
||||||
+ } else if (!desktopEnvironment.isEmpty() && desktopEnvironment != QByteArrayLiteral("UNKNOWN")) {
|
|
||||||
// Ignore X11 desktop environments
|
|
||||||
result.push_back(QString::fromLocal8Bit(desktopEnvironment.toLower()));
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
if (result.isEmpty())
|
|
Loading…
Reference in New Issue
Block a user