From b6208c6a4d81f62cedbd0a1b002334ff43856763 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Sat, 27 Feb 2016 01:56:14 +0100 Subject: Fix 'empty systray icons' for applications that use the Xembed protocol. Xembed issue is KDEBUG 359388. Fix a crash in plasma too; KDEBUG 357895. --- .../plasma-framework_KDEBUG_359388.patch | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 kde/patch/plasma-framework/plasma-framework_KDEBUG_359388.patch (limited to 'kde/patch/plasma-framework/plasma-framework_KDEBUG_359388.patch') diff --git a/kde/patch/plasma-framework/plasma-framework_KDEBUG_359388.patch b/kde/patch/plasma-framework/plasma-framework_KDEBUG_359388.patch new file mode 100644 index 0000000..078dbfd --- /dev/null +++ b/kde/patch/plasma-framework/plasma-framework_KDEBUG_359388.patch @@ -0,0 +1,31 @@ +From: Dan Vrátil +Date: Tue, 16 Feb 2016 16:59:32 +0000 +Subject: Fix IconItem not loading non-theme icons with name +X-Git-Url: http://quickgit.kde.org/?p=plasma-framework.git&a=commitdiff&h=525bf2d377c21b41971a72d694a507bf2af0ada6 +--- +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 +--- + + +--- a/src/declarativeimports/core/iconitem.cpp ++++ b/src/declarativeimports/core/iconitem.cpp +@@ -148,6 +148,10 @@ + //fail, use QIcon + } else { + m_icon = QIcon::fromTheme(sourceString); ++ if (m_icon.isNull()) { ++ // fallback for non-theme icons ++ m_icon = source.value(); ++ } + delete m_svgIcon; + m_svgIcon = 0; + m_imageIcon = QImage(); + -- cgit v1.2.3