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;