diff options
| author | Wolfgang Bauer <[email protected]> | 2016-04-26 16:17:59 +0200 |
|---|---|---|
| committer | Wolfgang Bauer <[email protected]> | 2016-04-26 16:17:59 +0200 |
| commit | 16e3d669de256aab86f957cd5b3bee91bd2fbbff (patch) | |
| tree | ac5a07ad2dff09a1b0894df3d78f1caab6138082 | |
| parent | 2798edfb5a7ed8762a5ea1e4d9432fd3caaf34f2 (diff) | |
| parent | 44d4d2ea715719a08c639541530a5b330647297d (diff) | |
Merge branch 'Applications/16.04'
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/kitemviews/kstandarditemlistwidget.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bd4732932..1d6818382 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,8 +4,8 @@ project(Dolphin) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "16") -set (KDE_APPLICATIONS_VERSION_MINOR "03") -set (KDE_APPLICATIONS_VERSION_MICRO "90") +set (KDE_APPLICATIONS_VERSION_MINOR "04") +set (KDE_APPLICATIONS_VERSION_MICRO "0") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") set(QT_MIN_VERSION "5.4.0") 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) { |