From 9518b7e0f198c69d747d93eca5bb003944492c9f Mon Sep 17 00:00:00 2001 From: Weitian Leung Date: Tue, 21 Oct 2014 14:45:38 +0800 Subject: Avoid adding empty parent icon theme "Icon Theme/Inherits" may assign an empty value, e.g. Flattr icon theme Change-Id: I90713b3eb67e39d6a49a49d1f5b3d7a75a8f30f4 Reviewed-by: Friedemann Kleint --- src/gui/image/qiconloader.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp index 750e253dee..06491f1155 100644 --- a/src/gui/image/qiconloader.cpp +++ b/src/gui/image/qiconloader.cpp @@ -223,6 +223,7 @@ QIconTheme::QIconTheme(const QString &themeName) // Parent themes provide fallbacks for missing icons m_parents = indexReader.value( QLatin1String("Icon Theme/Inherits")).toStringList(); + m_parents.removeAll(QString()); // Ensure a default platform fallback for all themes if (m_parents.isEmpty()) { -- cgit v1.2.3