1 files changed, 3 insertions, 35 deletions
diff --git a/src/render/qrendererpluginfactory.cpp b/src/render/qrendererpluginfactory.cpp
index 1c0fd2b33..76f4b01d7 100644
--- a/src/render/qrendererpluginfactory.cpp
+++ b/src/render/qrendererpluginfactory.cpp
@@ -52,46 +52,14 @@ namespace Qt3DRender {
 namespace Render {
 
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, (QRendererPluginFactoryInterface_iid, QLatin1String("/renderers"), Qt::CaseInsensitive))
-#ifndef QT_NO_LIBRARY
-Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, directLoader, (QRendererPluginFactoryInterface_iid, QLatin1String(""), Qt::CaseInsensitive))
-#endif
 
-QStringList QRendererPluginFactory::keys(const QString &pluginPath)
+QStringList QRendererPluginFactory::keys()
 {
-    QStringList list;
-    if (!pluginPath.isEmpty()) {
-#if QT_CONFIG(library)
-        QCoreApplication::addLibraryPath(pluginPath);
-        list = directLoader()->keyMap().values();
-        if (!list.isEmpty()) {
-            const QString postFix = QLatin1String(" (from ")
-                    + QDir::toNativeSeparators(pluginPath)
-                    + QLatin1Char(')');
-            const QStringList::iterator end = list.end();
-            for (QStringList::iterator it = list.begin(); it != end; ++it)
-                (*it).append(postFix);
-        }
-#else
-        qWarning() << QObject::tr("Cannot query QRendererPlugin plugins at %1. "
-                                  "Library loading is disabled.").arg(pluginPath);
-#endif
-    }
-    list.append(loader()->keyMap().values());
-    return list;
+    return loader->keyMap().values();
 }
 
-AbstractRenderer *QRendererPluginFactory::create(const QString &name, const QString &pluginPath)
+AbstractRenderer *QRendererPluginFactory::create(const QString &name)
 {
-    if (!pluginPath.isEmpty()) {
-#if QT_CONFIG(library)
-        QCoreApplication::addLibraryPath(pluginPath);
-        if (AbstractRenderer *ret = qLoadPlugin<AbstractRenderer, QRendererPlugin>(directLoader(), name))
-            return ret;
-#else
-        qWarning() << QObject::tr("Cannot load QRendererPlugin plugin from %1. "
-                                  "Library loading is disabled.").arg(pluginPath);
-#endif
-    }
     return qLoadPlugin<AbstractRenderer, QRendererPlugin>(loader(), name);
 }