From 639a04ac092c4f9548543ec5f9aaba1e2933b745 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@digia.com>
Date: Thu, 31 Oct 2013 14:22:35 +0100
Subject: [PATCH] QmlDesigner.ItemLibrary: to not scale null pixmaps

Change-Id: I23c22f3b0f383158814e105058e827e8703fb336
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
---
 .../components/itemlibrary/itemlibraryimageprovider.cpp       | 4 ++++
 .../qmldesigner/components/itemlibrary/itemlibrarywidget.cpp  | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimageprovider.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimageprovider.cpp
index 6912e09cbb3..7210fb3fbf2 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimageprovider.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimageprovider.cpp
@@ -44,6 +44,10 @@ QPixmap ItemLibraryImageProvider::requestPixmap(const QString &id, QSize *size,
         size->setWidth(pixmap.width());
         size->setHeight(pixmap.height());
     }
+
+    if (pixmap.isNull())
+        return pixmap;
+
     if (requestedSize.isValid())
         return pixmap.scaled(requestedSize);
     return pixmap;
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
index 9cdfb59448e..a1334a50685 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
@@ -412,6 +412,9 @@ QIcon ItemLibraryFileIconProvider::icon(const QFileInfo &info) const
         pixmap = defaultIcon.pixmap(defaultIcon.actualSize(m_iconSize));
     }
 
+    if (pixmap.isNull())
+        return pixmap;
+
     if (pixmap.width() == m_iconSize.width()
             && pixmap.height() == m_iconSize.height())
         return pixmap;