summaryrefslogtreecommitdiffstats
path: root/src/gui/image
diff options
context:
space:
mode:
authorWeitian Leung <liangweitian@kingsoft.com>2014-10-21 14:45:38 +0800
committerWeitian Leung <liangweitian@kingsoft.com>2014-10-22 08:03:49 +0200
commit9518b7e0f198c69d747d93eca5bb003944492c9f (patch)
tree3f660b276c2dd57b98edeff6e44d9892e92238e3 /src/gui/image
parent1c6b9955a5bacc8695e719b42d51de535fa5def1 (diff)
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 <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/gui/image')
-rw-r--r--src/gui/image/qiconloader.cpp1
1 files changed, 1 insertions, 0 deletions
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()) {