commit 525bf2d377c21b41971a72d694a507bf2af0ada6 Author: Dan Vrátil Date: Tue Feb 16 17:59:32 2016 +0100 Fix IconItem not loading non-theme icons with name Commit 5184ac introduced a small regression that caused IconItem to no longer load non-theme icons with name set, for instance icons coming from sni-qt, causing sni-qt apps to not show in systray. BUG: 359388 FIXED-IN: 5.20 REVIEW: 127091 diff --git a/src/declarativeimports/core/iconitem.cpp b/src/declarativeimports/core/iconitem.cpp index 1d7921a..085f284 100644 --- a/src/declarativeimports/core/iconitem.cpp +++ b/src/declarativeimports/core/iconitem.cpp @@ -148,6 +148,10 @@ void IconItem::setSource(const QVariant &source) //fail, use QIcon } else { m_icon = QIcon::fromTheme(sourceString); + if (m_icon.isNull()) { + // fallback for non-theme icons + m_icon = source.value(); + } delete m_svgIcon; m_svgIcon = 0; m_imageIcon = QImage();