From f1236713461da4a2e427d3e05102c5fe785017cf Mon Sep 17 00:00:00 2001
From: David Edmundson <kde@davidedmundson.co.uk>
Date: Tue, 6 May 2014 16:32:55 +0200
Subject: [PATCH] Check the right items are valid in iconItem

Reviewed-By: Marco Martin
---
 src/declarativeimports/core/iconitem.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/declarativeimports/core/iconitem.cpp b/src/declarativeimports/core/iconitem.cpp
index 825764f86..9cb487c6f 100644
--- a/src/declarativeimports/core/iconitem.cpp
+++ b/src/declarativeimports/core/iconitem.cpp
@@ -383,7 +383,7 @@ void IconItem::loadPixmap()
     } else if (m_svgIcon) {
         m_svgIcon->resize(size, size);
         result = m_svgIcon->pixmap(m_source.toString());
-    } else if (!m_source.isNull()) {
+    } else if (!m_icon.isNull()) {
         result = m_icon.pixmap(QSize(size, size));
     } else if (!m_pixmapIcon.isNull()) {
         result = m_pixmapIcon;