alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix IconItem not loading non-theme icons with name

Browse Source 
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
This commit is contained in:
Dan Vrátil 2016-02-16 17:59:32 +01:00
parent 4d012a8cc5
commit 525bf2d377
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/declarativeimports/core/iconitem.cpp
View File

@ -148,6 +148,10 @@ void IconItem::setSource(const QVariant &source)
//fail, use QIcon //fail, use QIcon
} else { } else {
m_icon = QIcon::fromTheme(sourceString); m_icon = QIcon::fromTheme(sourceString);
if (m_icon.isNull()) {
// fallback for non-theme icons
m_icon = source.value<QIcon>();
}
delete m_svgIcon; delete m_svgIcon;
m_svgIcon = 0; m_svgIcon = 0;
m_imageIcon = QImage(); m_imageIcon = QImage();