diff options
| author | Ilya Fedin <fedin-ilja2010@ya.ru> | 2023-04-06 03:54:20 +0400 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-04-14 13:19:08 +0000 |
| commit | 6d99fb3b5bda5a7f59d948aeadbf8dd3622e12cf (patch) | |
| tree | 5829d9c3aef6a4be481264f2ba4c73c95ac4a601 /src/plugins | |
| parent | b99357ecfa2f84e4726694fdff8746b8f5906e4a (diff) | |
| download | qtbase-6d99fb3b5bda5a7f59d948aeadbf8dd3622e12cf.tar.gz | |
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.
Change-Id: Icef2f50d495ac802e3a591d92c222523972b2066
Reviewed-by: Liang Qi <liang.qi@qt.io>
(cherry picked from commit c3f00ce3e34d5cfa3ee4227a3a453448ab2f8b31)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platformthemes/gtk3/qgtk3theme.cpp | 14 |
1 files changed, 0 insertions, 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<gint>("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); } |