diff plugin/LADSPAPluginFactory.cpp @ 1182:a1f410f895d3 3.0-integration

Merge from branch pluginscan

--- a/plugin/LADSPAPluginFactory.cpp	Fri Mar 18 14:25:05 2016 +0000
+++ b/plugin/LADSPAPluginFactory.cpp	Fri Apr 15 16:26:15 2016 +0100
@@ -668,14 +668,11 @@
 
     generateFallbackCategories();
 
-    for (std::vector<QString>::iterator i = pathList.begin();
-	 i != pathList.end(); ++i) {
+    QStringList candidates =
+        PluginScan::getInstance()->getCandidateLibrariesFor(getPluginType());
 
-	QDir pluginDir(*i, PLUGIN_GLOB);
-
-	for (unsigned int j = 0; j < pluginDir.count(); ++j) {
-	    discoverPluginsFrom(QString("%1/%2").arg(*i).arg(pluginDir[j]));
-	}
+    for (QString c: candidates) {
+        discoverPluginsFrom(c);
     }
 }