diff options
| author | Wolfgang Bauer <[email protected]> | 2016-04-26 16:11:26 +0200 |
|---|---|---|
| committer | Wolfgang Bauer <[email protected]> | 2016-04-26 16:11:26 +0200 |
| commit | 44d4d2ea715719a08c639541530a5b330647297d (patch) | |
| tree | f3a7241fba0bffed10608eb9c467ebc39169491a /src | |
| parent | 130bc9fbc10348534695a0693eba04bb74bd09d0 (diff) | |
Specify a fallback icon to QIcon::fromTheme()
The default fallback of QIcon::fromTheme() is QIcon(), i.e. a null icon.
Set the generic "unknown" icon as fallback to prevent missing icons for
filetypes that specify an icon name that doesn't exist.
This also gets rid of "QPixmap::scaled: Pixmap is a null pixmap"
warnings in that case.
BUG: 358958
BUG: 361034
FIXED-IN: 16.04.1
REVIEW: 127713
Diffstat (limited to 'src')
| -rw-r--r-- | src/kitemviews/kstandarditemlistwidget.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp index 66131d5fa..51c5bc896 100644 --- a/src/kitemviews/kstandarditemlistwidget.cpp +++ b/src/kitemviews/kstandarditemlistwidget.cpp @@ -1440,12 +1440,13 @@ void KStandardItemListWidget::closeRoleEditor() QPixmap KStandardItemListWidget::pixmapForIcon(const QString& name, const QStringList& overlays, int size) { + static const QIcon fallbackIcon = QIcon::fromTheme(QStringLiteral("unknown")); size *= qApp->devicePixelRatio(); const QString key = "KStandardItemListWidget:" % name % ":" % overlays.join(QStringLiteral(":")) % ":" % QString::number(size); QPixmap pixmap; if (!QPixmapCache::find(key, pixmap)) { - const QIcon icon = QIcon::fromTheme(name); + const QIcon icon = QIcon::fromTheme(name, fallbackIcon); int requestedSize; if (size <= KIconLoader::SizeSmall) { |