[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=6281b9c

The following commit has been merged in the master branch:
commit 6281b9c232058759b21bf8e60c2f374fb5d42739
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Sun Aug 28 11:19:00 2016 +0200

    Make it compile with Qt < 5.6
---
 core/pluginloader.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/core/pluginloader.cpp b/core/pluginloader.cpp
index 0a908f5..b913d6c 100644
--- a/core/pluginloader.cpp
+++ b/core/pluginloader.cpp
@@ -109,8 +109,18 @@ QSet<QString> PluginLoader::pluginsForCapabilities(const QSet<QString>& incoming
         const QSet<QString> pluginIncomingCapabilities = KPluginMetaData::readStringList(service.rawData(), "X-KdeConnect-SupportedPackageType").toSet();
         const QSet<QString> pluginOutgoingCapabilities = KPluginMetaData::readStringList(service.rawData(), "X-KdeConnect-OutgoingPackageType").toSet();
 
-        if ((pluginIncomingCapabilities.isEmpty() && pluginOutgoingCapabilities.isEmpty())
-            || incoming.intersects(pluginOutgoingCapabilities) || outgoing.intersects(pluginIncomingCapabilities)) {
+        bool capabilitiesEmpty = (pluginIncomingCapabilities.isEmpty() && pluginOutgoingCapabilities.isEmpty());
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
+        bool capabilitiesIntersect = (outgoing.intersects(pluginIncomingCapabilities) || incoming.intersects(pluginOutgoingCapabilities));
+#else
+        QSet<QString> commonIncoming = incoming;
+        commonIncoming.intersect(pluginOutgoingCapabilities);
+        QSet<QString> commonOutgoing = outgoing;
+        commonOutgoing.intersect(pluginIncomingCapabilities);
+        bool capabilitiesIntersect = (!commonIncoming.isEmpty() || !commonOutgoing.isEmpty());
+#endif
+
+        if (capabilitiesIntersect || capabilitiesEmpty) {
             ret += service.pluginId();
         } else {
             qCDebug(KDECONNECT_CORE) << "Not loading plugin" << service.pluginId() <<  "because device doesn't support it";

-- 
kdeconnect packaging