parent
2faa10538d
commit
3dd1056917
@ -1,28 +0,0 @@
|
||||
From 1e196fdfb2a6eaf1664e1155c086616d55c6712b Mon Sep 17 00:00:00 2001
|
||||
From: David Rosca <nowrep@gmail.com>
|
||||
Date: Mon, 15 Feb 2016 19:05:26 +0100
|
||||
Subject: [PATCH 07/25] WindowThumbnail: Discard glx pixmap in
|
||||
stopRedirecting()
|
||||
|
||||
BUG: 357895
|
||||
FIXED-IN: 5.20
|
||||
REVIEW: 127072
|
||||
---
|
||||
src/declarativeimports/core/windowthumbnail.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/declarativeimports/core/windowthumbnail.cpp b/src/declarativeimports/core/windowthumbnail.cpp
|
||||
index 21e655e..b838053 100644
|
||||
--- a/src/declarativeimports/core/windowthumbnail.cpp
|
||||
+++ b/src/declarativeimports/core/windowthumbnail.cpp
|
||||
@@ -584,6 +584,7 @@ void WindowThumbnail::stopRedirecting()
|
||||
return;
|
||||
}
|
||||
xcb_composite_unredirect_window(c, m_winId, XCB_COMPOSITE_REDIRECT_AUTOMATIC);
|
||||
+ discardPixmap();
|
||||
if (m_damage == XCB_NONE) {
|
||||
return;
|
||||
}
|
||||
--
|
||||
2.5.0
|
||||
|
@ -1,34 +0,0 @@
|
||||
From 525bf2d377c21b41971a72d694a507bf2af0ada6 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil@kde.org>
|
||||
Date: Tue, 16 Feb 2016 17:59:32 +0100
|
||||
Subject: [PATCH 09/25] 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
|
||||
---
|
||||
src/declarativeimports/core/iconitem.cpp | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
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.5.0
|
||||
|
Loading…
Reference in new issue