From e81b63540635ca5d4d3cdfa07b2658c1b3692f6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCgler?= <sebas@kde.org>
Date: Thu, 12 Sep 2013 02:03:52 +0200
Subject: [PATCH] Use KPluginTrader to locate the dataengine.

---
 src/plasma/pluginloader.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/plasma/pluginloader.cpp b/src/plasma/pluginloader.cpp
index 281aa6d20..9d46bf6db 100644
--- a/src/plasma/pluginloader.cpp
+++ b/src/plasma/pluginloader.cpp
@@ -58,6 +58,7 @@ public:
     static QSet<QString> s_customCategories;
     QHash<QString, QWeakPointer<PackageStructure> > structures;
     bool isDefaultLoader;
+    QString pluginDir;
 };
 
 QSet<QString> PluginLoaderPrivate::s_customCategories;
@@ -110,6 +111,7 @@ QString PluginLoaderPrivate::parentAppConstraint(const QString &parentApp)
 PluginLoader::PluginLoader()
     : d(new PluginLoaderPrivate)
 {
+    d->pluginDir = "kf5";
     d->isDefaultLoader = false;
 }
 
@@ -709,8 +711,9 @@ KPluginInfo::List PluginLoader::listDataEngineInfo(const QString &parentApp)
         constraint.append("[X-KDE-ParentApp] == '").append(parentApp).append("'");
     }
 
-    KService::List offers = KServiceTypeTrader::self()->query("Plasma/DataEngine", constraint);
-    return list + KPluginInfo::fromServices(offers);
+    list.append(KPluginTrader::self()->query(QStringLiteral("Plasma/DataEngine"),
+                                             d->pluginDir, constraint));
+    return list;
 }
 
 KPluginInfo::List PluginLoader::listRunnerInfo(const QString &parentApp)