Get icon theme from gtk if qt5ct is unconfigured

This commit is contained in:
Ilya Fedin 2020-09-19 21:57:17 +04:00 committed by John Preston
parent 242ced4022
commit 0cd68f866d

View file

@ -149,10 +149,16 @@ bool setupGtkBase(QLibrary &lib_gtk) {
bool IconThemeShouldBeSet() { bool IconThemeShouldBeSet() {
// change the icon theme only if it isn't already set by a platformtheme plugin // change the icon theme only if it isn't already set by a platformtheme plugin
// if QT_QPA_PLATFORMTHEME=(gtk2|gtk3), then force-apply the icon theme // if QT_QPA_PLATFORMTHEME=(gtk2|gtk3), then force-apply the icon theme
static const auto Result = ((QIcon::themeName() == qstr("hicolor") // QGenericUnixTheme static const auto Result =
&& QIcon::fallbackThemeName() == qstr("hicolor")) // QGenericUnixTheme
|| (QIcon::themeName() == qstr("Adwaita") // QGnomeTheme (QIcon::themeName() == qstr("hicolor")
&& QIcon::fallbackThemeName() == qstr("gnome"))) && QIcon::fallbackThemeName() == qstr("hicolor"))
// QGnomeTheme
|| (QIcon::themeName() == qstr("Adwaita")
&& QIcon::fallbackThemeName() == qstr("gnome"))
// qt5ct
|| (QIcon::themeName().isEmpty()
&& QIcon::fallbackThemeName().isEmpty())
|| IsGtkIntegrationForced(); || IsGtkIntegrationForced();
return Result; return Result;