Mercurial > octave
changeset 30775:94da6cc40ea9
test for qt 5.11 for icon fallback search path (bug #62106)
* ressource-manger.cc (config_icon_theme): only use fallback search path
if qt version is greater or equal 5.11
author | Torsten Lilge <ttl-octave@mailbox.org> |
---|---|
date | Wed, 23 Feb 2022 23:25:55 +0100 |
parents | d6d64afc58f9 |
children | bc390b9d14f9 |
files | libgui/src/resource-manager.cc |
diffstat | 1 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/resource-manager.cc Wed Feb 23 20:48:07 2022 +0100 +++ b/libgui/src/resource-manager.cc Wed Feb 23 23:25:55 2022 +0100 @@ -187,12 +187,18 @@ void resource_manager::config_icon_theme (void) { +#if (QT_VERSION >= 0x051100) QStringList fallbacks (QIcon::fallbackSearchPaths ()); +#else + QStringList fallbacks; +#endif // FIXME: update fallbacks depending on selection (tango, octave or system) // Can cursor be moce to :/cursor and added as search path // By this, we can generate the list of themes from the :/icons dir? + + if (m_settings && (! m_settings->value (global_icon_theme).toBool ())) { QIcon::setThemeName ("tango"); @@ -206,7 +212,9 @@ fallbacks << ":/cursors"; +#if (QT_VERSION >= 0x051100) QIcon::setFallbackSearchPaths (fallbacks); +#endif } gui_settings * resource_manager::get_settings (void) const