diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimageprovider.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimageprovider.cpp index 6912e09cbb32c8dc87c763ab0d4520c5541a8a9d..7210fb3fbf28309fd363662e50ec876b3a351a51 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 9cdfb59448e931d85d74715255f329ddc21d06fd..a1334a5068599b6f39ff714c980bef4b993027a3 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;