Pull upstream patch for 359388

epel9
Daniel Vrátil 9 years ago
parent 80872671ca
commit 78d25de32a

@ -0,0 +1,29 @@
commit 525bf2d377c21b41971a72d694a507bf2af0ada6
Author: Dan Vrátil <dvratil@kde.org>
Date: Tue Feb 16 17:59:32 2016 +0100
Fix IconItem not loading non-theme icons with name
Commit 5184ac introduced a small regression that caused IconItem
to no longer load non-theme icons with name set, for instance icons
coming from sni-qt, causing sni-qt apps to not show in systray.
BUG: 359388
FIXED-IN: 5.20
REVIEW: 127091
diff --git a/src/declarativeimports/core/iconitem.cpp b/src/declarativeimports/core/iconitem.cpp
index 1d7921a..085f284 100644
--- a/src/declarativeimports/core/iconitem.cpp
+++ b/src/declarativeimports/core/iconitem.cpp
@@ -148,6 +148,10 @@ void IconItem::setSource(const QVariant &source)
//fail, use QIcon
} else {
m_icon = QIcon::fromTheme(sourceString);
+ if (m_icon.isNull()) {
+ // fallback for non-theme icons
+ m_icon = source.value<QIcon>();
+ }
delete m_svgIcon;
m_svgIcon = 0;
m_imageIcon = QImage();

@ -2,7 +2,7 @@
Name: kf5-%{framework}
Version: 5.19.0
Release: 1%{?dist}
Release: 2%{?dist}
Summary: KDE Frameworks 5 Tier 3 framework is foundation to build a primary user interface
License: GPLv2+ and LGPLv2+ and BSD
@ -21,6 +21,7 @@ Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}
Source10: fedora-plasma-cache.sh.in
## upstream patches
Patch0: 0001-fix-iconitem-not-loading-non-theme-icons.patch
BuildRequires: extra-cmake-modules >= %{version}
BuildRequires: kf5-kactivities-devel >= %{version}
@ -141,6 +142,9 @@ sed -e "s|@@VERSION@@|%{version}|g" fedora-plasma-cache.sh.in > \
%changelog
* Thu Feb 16 2016 Daniel Vrátil <dvratil@fedoraproject.org> - 5.19.0-2
- pull upstream patch for BKO#359388
* Thu Feb 11 2016 Daniel Vrátil <dvratil@fedoraproject.org> - 5.19.0-1
- KDE Frameworks 5.19.0

Loading…
Cancel
Save