[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kcoreaddons] src/lib/plugin: Fix regression caused by RR 125527
From: Alex Richardson <arichardson.kde () gmail ! com>
Date: 2015-11-30 20:40:13
Message-ID: E1a3VF7-0005ZT-76 () scm ! kde ! org
[Download RAW message or body]
Git commit 78d740aece90b676086412f977d4cd691791bd8f by Alex Richardson.
Committed on 30/11/2015 at 20:39.
Pushed by arichardson into branch 'master'.
Fix regression caused by RR 125527
Make sure that applications using kcoreaddons_desktop_to_json() that
depend on reading the MimeType property of the root object still work
See https://git.reviewboard.kde.org/r/125527/
REVIEW: 126196
M +3 -0 src/lib/plugin/desktopfileparser.cpp
http://commits.kde.org/kcoreaddons/78d740aece90b676086412f977d4cd691791bd8f
diff --git a/src/lib/plugin/desktopfileparser.cpp b/src/lib/plugin/desktopfileparser.cpp
index 56f8bc9..f65444f 100644
--- a/src/lib/plugin/desktopfileparser.cpp
+++ b/src/lib/plugin/desktopfileparser.cpp
@@ -401,6 +401,9 @@ void DesktopFileParser::convertToJson(const QByteArray &key, const ServiceTypeDe
} else if (key == QByteArrayLiteral("MimeType")) {
// MimeType is a XDG string list and not a KConfig list so we need to use ';' as the separator
kplugin[QStringLiteral("MimeTypes")] = QJsonArray::fromStringList(deserializeList(value, ';'));
+ // make sure that applications using kcoreaddons_desktop_to_json() that depend on reading
+ // the MimeType property still work (see https://git.reviewboard.kde.org/r/125527/)
+ json[QStringLiteral("MimeType")] = value; // TODO KF6 remove this compatibility code
} else if (key == QByteArrayLiteral("X-KDE-FormFactors")) {
kplugin[QStringLiteral("FormFactors")] = QJsonArray::fromStringList(deserializeList(value));
} else if (key == QByteArrayLiteral("X-KDE-PluginInfo-EnabledByDefault")) {
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic