diff options
author | Igor Poboiko <igor.poboiko@gmail.com> | 2020-05-22 16:32:27 +0300 |
---|---|---|
committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2020-06-25 13:42:31 +0200 |
commit | fc957e1281f889a6e711c24d81eb65bba40265a8 (patch) | |
tree | 02ef8733ef8ac50f3a28eb90525ce01144965680 /vcl | |
parent | 587d75bc5bcd308168bc30567ab45b08e1ae062c (diff) |
tdf#127138: Fix detection of system icon theme with Qt5/KF5
The title is self-explanatory.
The QIcon::themeName() actually uses Qt Platform Abstraction plugins, i.e.
it's aware of KDE preferred icon theme via Qt Plasma integration module.
(note that it is _currently_ broken due to KDE bug
https://bugs.kde.org/show_bug.cgi?id=402172, which causes themeName to
return empty string; however, it's being worked on)
Change-Id: Ibc7cf9ee9ae73b492046219487760561d7d2ea45
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94691
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <bubli@bubli.org>
(cherry picked from commit 584eba1fec6a47f4aae69afbdec7fc761bb68d29)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96997
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/qt5/Qt5Frame.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx index daa930ff6b82..ed3368ac3970 100644 --- a/vcl/qt5/Qt5Frame.cxx +++ b/vcl/qt5/Qt5Frame.cxx @@ -1130,6 +1130,9 @@ void Qt5Frame::UpdateSettings(AllSettings& rSettings) } style.SetMenuBarHighlightTextColor(style.GetMenuHighlightTextColor()); + // Icon theme + style.SetPreferredIconTheme(toOUString(QIcon::themeName())); + // Scroll bar size style.SetScrollBarSize(QApplication::style()->pixelMetric(QStyle::PM_ScrollBarExtent)); style.SetMinThumbSize(QApplication::style()->pixelMetric(QStyle::PM_ScrollBarSliderMin)); |