update in the right project
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/milou5?expand=0&rev=99
This commit is contained in:
parent
a503c83c9a
commit
8f3659cfe3
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:05fb2dfa8cf892a0bedbb3faf4138e58521a8618f28930bf3862e6236416df72
|
||||
size 54128
|
3
milou-5.7.95.tar.xz
Normal file
3
milou-5.7.95.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c997df39c1e0873cb80170e7d65b074b7f01fefda7b87faf9ea0e9e1c492c6cc
|
||||
size 54072
|
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 15 15:53:55 UTC 2016 - fabian@ritter-vogt.de
|
||||
|
||||
- Update to 5.7.95 (Plasma 5.8 Beta)
|
||||
* New LTS feature release
|
||||
* For more details please see:
|
||||
https://www.kde.org/announcements/plasma-5.7.95.php
|
||||
- Removed patch use-iconName.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 13 17:42:09 UTC 2016 - fabian@ritter-vogt.de
|
||||
|
||||
|
@ -18,15 +18,13 @@
|
||||
|
||||
%bcond_without lang
|
||||
Name: milou5
|
||||
Version: 5.7.5
|
||||
Version: 5.7.95
|
||||
Release: 0
|
||||
Summary: Dedicated search application built on top of Baloo
|
||||
License: GPL-2.0+ and LGPL-2.1+
|
||||
Group: System/GUI/KDE
|
||||
Url: https://projects.kde.org/milou
|
||||
Source: http://download.kde.org/stable/plasma/%{version}/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
|
||||
Source: http://download.kde.org/unstable/plasma/%{version}/milou-%{version}.tar.xz
|
||||
BuildRequires: extra-cmake-modules >= 1.2.0
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: kf5-filesystem
|
||||
@ -52,7 +50,6 @@ 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}
|
||||
@ -63,7 +60,6 @@ A dedicated search application built on top of Baloo
|
||||
%if %{with lang}
|
||||
%kf5_find_lang
|
||||
%endif
|
||||
|
||||
%fdupes -s %{buildroot}%{_kf5_localedir}/
|
||||
|
||||
%post
|
||||
|
@ -1,46 +0,0 @@
|
||||
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:
|
||||
|
Loading…
x
Reference in New Issue
Block a user