Merge branch 'release/20.08'

This commit is contained in:
Alexander Lohnau 2020-08-30 18:49:22 +02:00
commit 5360bc3ab3

View file

@ -1474,7 +1474,13 @@ QPixmap KStandardItemListWidget::pixmapForIcon(const QString& name, const QStrin
QPixmap pixmap;
if (!QPixmapCache::find(key, &pixmap)) {
const QIcon icon = QIcon::fromTheme(name, fallbackIcon);
QIcon icon = QIcon::fromTheme(name);
if (icon.isNull()) {
icon = QIcon(name);
}
if (icon.isNull()) {
icon = fallbackIcon;
}
pixmap = icon.pixmap(size / qApp->devicePixelRatio(), size / qApp->devicePixelRatio(), mode);
if (pixmap.width() != size || pixmap.height() != size) {