Revert "Gtk3Theme: set XCURSOR_SIZE and XCURSOR_THEME for wayland sessions"
This reverts commitc0b0c7bebb
. QPlatformTheme::MouseCursorTheme and MouseCursorSize was added in qtbasea823366f77
and qtwayland client supports it in 1c25db5e3f23d48e330170f41b94fbd532932b02. Pick-to: 6.5 Change-Id: Icef2f50d495ac802e3a591d92c222523972b2066 Reviewed-by: Liang Qi <liang.qi@qt.io>
This commit is contained in:
parent
42d3e242fa
commit
c3f00ce3e3
@ -104,20 +104,6 @@ QGtk3Theme::QGtk3Theme()
|
|||||||
SETTING_CONNECT("gtk-cursor-theme-size");
|
SETTING_CONNECT("gtk-cursor-theme-size");
|
||||||
#undef SETTING_CONNECT
|
#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);
|
m_storage.reset(new QGtk3Storage);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user