summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2017-03-13 21:56:30 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2017-03-13 21:56:30 +0100
commit6264d1f4e26f9f6057f8237d834b848365c91ea8 (patch)
tree0aa5c31f82c4d615746f404f4d2ab9745a705060 /kde-frameworks/plasma/files/plasma-5.32.0-prefix-qstringlist.patch
parentkde-apps/kde-apps-meta: Drop old (diff)
downloadgentoo-6264d1f4e26f9f6057f8237d834b848365c91ea8.tar.gz
gentoo-6264d1f4e26f9f6057f8237d834b848365c91ea8.tar.bz2
gentoo-6264d1f4e26f9f6057f8237d834b848365c91ea8.zip
kde-frameworks/plasma: Fix Plasma folderview regression
KDE BUG https://bugs.kde.org/show_bug.cgi?id=377441 Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'kde-frameworks/plasma/files/plasma-5.32.0-prefix-qstringlist.patch')
-rw-r--r--kde-frameworks/plasma/files/plasma-5.32.0-prefix-qstringlist.patch43
1 files changed, 43 insertions, 0 deletions
diff --git a/kde-frameworks/plasma/files/plasma-5.32.0-prefix-qstringlist.patch b/kde-frameworks/plasma/files/plasma-5.32.0-prefix-qstringlist.patch
new file mode 100644
index 000000000000..460d1bd94eda
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.32.0-prefix-qstringlist.patch
@@ -0,0 +1,43 @@
+From 547a34d346695295ce05499ae355203414412993 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Fri, 10 Mar 2017 09:49:47 +0000
+Subject: Handle applyPrefixes with an empty string
+
+Summary:
+When setting an empty QStringList as prefix, it can lead to unexpected results, such as the prefix not changing.
+
+BUG: 377441
+
+Reviewers: #plasma
+
+Subscribers: plasma-devel, #frameworks
+
+Tags: #plasma, #frameworks
+
+Differential Revision: https://phabricator.kde.org/D5000
+---
+ src/declarativeimports/core/framesvgitem.cpp | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/declarativeimports/core/framesvgitem.cpp b/src/declarativeimports/core/framesvgitem.cpp
+index 81f9e63..8e6225f 100644
+--- a/src/declarativeimports/core/framesvgitem.cpp
++++ b/src/declarativeimports/core/framesvgitem.cpp
+@@ -556,7 +556,13 @@ void FrameSvgItem::updateDevicePixelRatio()
+
+ void FrameSvgItem::applyPrefixes()
+ {
+- if (m_prefixes.isEmpty() || m_frameSvg->imagePath().isEmpty()) {
++
++ if (m_frameSvg->imagePath().isEmpty()) {
++ return;
++ }
++
++ if (m_prefixes.isEmpty()) {
++ m_frameSvg->setElementPrefix(QString());
+ return;
+ }
+
+--
+cgit v0.11.2
+