forked from pool/kdeconnect-kde
34 lines
1.7 KiB
Diff
34 lines
1.7 KiB
Diff
|
From: Albert Vaca <albertvaka@gmail.com>
|
||
|
|
Date: Sun, 28 Aug 2016 09:19:00 +0000
|
||
|
|
Subject: Make it compile with Qt < 5.6
|
||
|
|
X-Git-Url: http://quickgit.kde.org/?p=kdeconnect-kde.git&a=commitdiff&h=6281b9c232058759b21bf8e60c2f374fb5d42739
|
||
|
|
---
|
||
|
|
Make it compile with Qt < 5.6
|
||
|
|
---
|
||
|
|
|
||
|
|
|
||
|
|
--- a/core/pluginloader.cpp
|
||
|
|
+++ b/core/pluginloader.cpp
|
||
|
|
@@ -109,8 +109,18 @@
|
||
|
|
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";
|
||
|
|
|