From c3f00ce3e34d5cfa3ee4227a3a453448ab2f8b31 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Thu, 6 Apr 2023 03:54:20 +0400 Subject: [PATCH] Revert "Gtk3Theme: set XCURSOR_SIZE and XCURSOR_THEME for wayland sessions" This reverts commit c0b0c7bebb73e1aa609196ce33668a54bd5e0aef. QPlatformTheme::MouseCursorTheme and MouseCursorSize was added in qtbase a823366f7745c235a752dc01c42276b3fa410937 and qtwayland client supports it in 1c25db5e3f23d48e330170f41b94fbd532932b02. Pick-to: 6.5 Change-Id: Icef2f50d495ac802e3a591d92c222523972b2066 Reviewed-by: Liang Qi --- src/plugins/platformthemes/gtk3/qgtk3theme.cpp | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/plugins/platformthemes/gtk3/qgtk3theme.cpp b/src/plugins/platformthemes/gtk3/qgtk3theme.cpp index 1df4cf94a3..9d23ba7e48 100644 --- a/src/plugins/platformthemes/gtk3/qgtk3theme.cpp +++ b/src/plugins/platformthemes/gtk3/qgtk3theme.cpp @@ -104,20 +104,6 @@ QGtk3Theme::QGtk3Theme() SETTING_CONNECT("gtk-cursor-theme-size"); #undef SETTING_CONNECT - /* Set XCURSOR_SIZE and XCURSOR_THEME for Wayland sessions */ - if (QGuiApplication::platformName().startsWith("wayland"_L1)) { - if (qEnvironmentVariableIsEmpty("XCURSOR_SIZE")) { - const int cursorSize = gtkSetting("gtk-cursor-theme-size"); - if (cursorSize > 0) - qputenv("XCURSOR_SIZE", QByteArray::number(cursorSize)); - } - if (qEnvironmentVariableIsEmpty("XCURSOR_THEME")) { - const QString cursorTheme = gtkSetting("gtk-cursor-theme-name"); - if (!cursorTheme.isEmpty()) - qputenv("XCURSOR_THEME", cursorTheme.toUtf8()); - } - } - m_storage.reset(new QGtk3Storage); }