pool/milou5
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 423030 from home:wolfi323:test

Browse Source 
- Add use-iconName.patch to use iconName instead of icon if set, that's preferred since KDE Frameworks 5.24 because having each runner set (and lookup) an icon for the results can lead to threading issues (boo#994983)

OBS-URL: https://build.opensuse.org/request/show/423030
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/milou5?expand=0&rev=95
This commit is contained in:
Raymond Wooninck 2016-08-26 11:28:05 +00:00 committed by Git OBS Bridge
parent de89c46a8b
commit cad22e75cc
3 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
milou5.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Aug 25 20:15:03 UTC 2016 - wbauer@tmo.at
- Add use-iconName.patch to use iconName instead of icon if set,
that's preferred since KDE Frameworks 5.24 because having each
runner set (and lookup) an icon for the results can lead to
threading issues (boo#994983)
-------------------------------------------------------------------
Fri Aug 12 23:36:20 UTC 2016 - hrvoje.senjan@gmail.com

3
milou5.spec
View File

@ -25,6 +25,8 @@ License: GPL-2.0+ and LGPL-2.1+
Group: System/GUI/KDE
Url: https://projects.kde.org/milou
Source: milou-%{version}.tar.xz
# PATCH-FIX-UPSTREAM use-iconName.patch boo#994983 -- use iconName for the results if it is set, that's preferred since having each runner set an icon for the results can lead to threading issues
Patch: use-iconName.patch
BuildRequires: extra-cmake-modules >= 1.2.0
BuildRequires: fdupes
BuildRequires: kf5-filesystem
@ -50,6 +52,7 @@ A dedicated search application built on top of Baloo
%lang_package
%prep
%setup -q -n milou-%{version}
%patch -p1
%build
%cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}

46
use-iconName.patch Normal file
View File

@ -0,0 +1,46 @@
From: Kai Uwe Broulik <kde@privat.broulik.de>
Date: Fri, 17 Jun 2016 11:45:46 +0000
Subject: Make use of new QueryMatch::iconName() and use a PlasmaCore.IconItem instead of QIconItem
X-Git-Url: http://quickgit.kde.org/?p=milou.git&a=commitdiff&h=5e0d799f63796741efff3ff3d780df81f03dd66f
---
Make use of new QueryMatch::iconName() and use a PlasmaCore.IconItem instead of QIconItem
---
--- a/lib/qml/ResultDelegate.qml
+++ b/lib/qml/ResultDelegate.qml
@@ -163,13 +163,13 @@
rightMargin: units.smallSpacing
}
- QtExtra.QIconItem {
+ PlasmaCore.IconItem {
id: typePixmap
- width: Globals.IconSize
- height: Globals.IconSize
-
- icon: model.decoration
- smooth: true
+ Layout.preferredWidth: Globals.IconSize
+ Layout.fillHeight: true
+ source: model.decoration
+ usesPlasmaTheme: false
+ animated: false
}
PlasmaComponents.Label {
--- a/lib/sourcesmodel.cpp
+++ b/lib/sourcesmodel.cpp
@@ -103,6 +103,10 @@
return m.text();
case Qt::DecorationRole:
+ if (!m.iconName().isEmpty()) {
+ return m.iconName();
+ }
+
return m.icon();
case TypeRole: