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

Check the right items are valid in iconItem

Browse Source 
Reviewed-By: Marco Martin
This commit is contained in:
David Edmundson 2014-05-06 16:32:55 +02:00
parent 9d24b7e391
commit f123671346
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -383,7 +383,7 @@ void IconItem::loadPixmap()
} else if (m_svgIcon) { } else if (m_svgIcon) {
m_svgIcon->resize(size, size); m_svgIcon->resize(size, size);
result = m_svgIcon->pixmap(m_source.toString()); result = m_svgIcon->pixmap(m_source.toString());
} else if (!m_source.isNull()) { } else if (!m_icon.isNull()) {
result = m_icon.pixmap(QSize(size, size)); result = m_icon.pixmap(QSize(size, size));
} else if (!m_pixmapIcon.isNull()) { } else if (!m_pixmapIcon.isNull()) {
result = m_pixmapIcon; result = m_pixmapIcon;