Commit 5360bc3a authored by Alexander Lohnau's avatar Alexander Lohnau
Browse files

Merge branch 'release/20.08'

parents 7c2559dd 004734e8
......@@ -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) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment