Hrvoje Senjan 2015-11-15 16:13:13 +00:00 committed by Git OBS Bridge
parent a464769064
commit 240a90cd17
3 changed files with 40 additions and 1 deletions

View File

@ -0,0 +1,31 @@
From 6e9c03a79e4702e57cb3164233ac2b71f18626a9 Mon Sep 17 00:00:00 2001
From: David Edmundson <kde@davidedmundson.co.uk>
Date: Thu, 12 Nov 2015 19:22:40 +0000
Subject: [PATCH 1/1] Don't add extra KDE SNI actions in our systemtray qpt
plugin
If any app is written using QSystemTrayIcon they'll have to provide
their own quit action in order to work on other platforms. If we add
our own entry apps end up with two quit entries.
BUG: 354991
REVIEW: 126047
---
src/platformtheme/kdeplatformsystemtrayicon.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/platformtheme/kdeplatformsystemtrayicon.cpp b/src/platformtheme/kdeplatformsystemtrayicon.cpp
index 7536697d59ed2b2f11aa10180e87d003b5579a16..8f0ce7b9a95ae4b8c2fba302966166adfc5f59f8 100644
--- a/src/platformtheme/kdeplatformsystemtrayicon.cpp
+++ b/src/platformtheme/kdeplatformsystemtrayicon.cpp
@@ -268,6 +268,7 @@ void KDEPlatformSystemTrayIcon::init()
{
if (!m_sni) {
m_sni = new KStatusNotifierItem();
+ m_sni->setStandardActionsEnabled(false);
m_sni->setTitle(QApplication::applicationDisplayName());
connect(m_sni, &KStatusNotifierItem::activateRequested, [this](bool active, const QPoint &pos) {
Q_UNUSED(active)
--
2.6.2

View File

@ -1,9 +1,14 @@
-------------------------------------------------------------------
Sun Nov 8 16:57:02 UTC 2015 - hrvoje.senjan@gmail.com
- Update to 5.16.0
- Update to 5.16.0 (boo#955067)
* Set default value for WheelScrollLines
* Fix WheelScrollLines settings with Qt >= 5.5 (kde#291144)
* Switch to Noto font for Plasma 5.5
* For more details please see:
https://www.kde.org/announcements/kde-frameworks-5.16.0.php
- Added 0001-Don-t-add-extra-KDE-SNI-actions-in-our-systemtray-qp.patch
(kde#354991)
-------------------------------------------------------------------
Mon Oct 5 17:36:58 UTC 2015 - hrvoje.senjan@gmail.com

View File

@ -47,6 +47,8 @@ Group: System/GUI/KDE
Url: http://www.kde.org
Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz
Source1: baselibs.conf
# PATCH-FIX-UPSTREAM 0001-Don-t-add-extra-KDE-SNI-actions-in-our-systemtray-qp.patch
Patch0: 0001-Don-t-add-extra-KDE-SNI-actions-in-our-systemtray-qp.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -104,6 +106,7 @@ Applications do not need to link to this directly. Development files
%lang_package -n %lname
%prep
%setup -q
%patch0 -p1
%build
%cmake_kf5 -d build