diff --git a/qt5-qtwayland.spec b/qt5-qtwayland.spec index 42c0491..451dff0 100644 --- a/qt5-qtwayland.spec +++ b/qt5-qtwayland.spec @@ -12,9 +12,6 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod # 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 diff --git a/qtwayland-use-gnome-platform-theme-on-gnome-based-desktops.patch b/qtwayland-use-gnome-platform-theme-on-gnome-based-desktops.patch deleted file mode 100644 index d4463bf..0000000 --- a/qtwayland-use-gnome-platform-theme-on-gnome-based-desktops.patch +++ /dev/null @@ -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 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())