4 files changed, 9 insertions, 73 deletions
diff --git a/src/render/io/qsceneexportfactory.cpp b/src/render/io/qsceneexportfactory.cpp
index 10db614f4..e87896ff3 100644
--- a/src/render/io/qsceneexportfactory.cpp
+++ b/src/render/io/qsceneexportfactory.cpp
@@ -51,45 +51,14 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DRender {
 
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, (QSceneExportFactoryInterface_iid, QLatin1String("/sceneparsers"), Qt::CaseInsensitive))
-#if QT_CONFIG(library)
-Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, directLoader, (QSceneExportFactoryInterface_iid, QLatin1String(""), Qt::CaseInsensitive))
-#endif
 
-QStringList QSceneExportFactory::keys(const QString &pluginPath)
+QStringList QSceneExportFactory::keys()
 {
-#if QT_CONFIG(library)
-    QStringList list;
-    if (!pluginPath.isEmpty()) {
-        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);
-        }
-    }
-    list.append(loader()->keyMap().values());
-    return list;
-#else
     return loader()->keyMap().values();
-#endif
 }
 
-QSceneExporter *QSceneExportFactory::create(const QString &name, const QStringList &args,
-                                            const QString &pluginPath)
+QSceneExporter *QSceneExportFactory::create(const QString &name, const QStringList &args)
 {
-#if QT_CONFIG(library)
-    if (!pluginPath.isEmpty()) {
-        QCoreApplication::addLibraryPath(pluginPath);
-        if (QSceneExporter *ret = qLoadPlugin<QSceneExporter,
-                QSceneExportPlugin>(directLoader(), name, args)) {
-            return ret;
-        }
-    }
-#endif
     return qLoadPlugin<QSceneExporter, QSceneExportPlugin>(loader(), name, args);
 }
 
diff --git a/src/render/io/qsceneexportfactory_p.h b/src/render/io/qsceneexportfactory_p.h
index fbb278ebe..2a0d29155 100644
--- a/src/render/io/qsceneexportfactory_p.h
+++ b/src/render/io/qsceneexportfactory_p.h
@@ -64,9 +64,8 @@ class QSceneExporter;
 class Q_3DRENDERSHARED_PRIVATE_EXPORT QSceneExportFactory
 {
 public:
-    static QStringList keys(const QString &pluginPath = QString());
-    static QSceneExporter *create(const QString &name, const QStringList &args,
-                                  const QString &pluginPath = QString());
+    static QStringList keys();
+    static QSceneExporter *create(const QString &name, const QStringList &args);
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/io/qsceneimportfactory.cpp b/src/render/io/qsceneimportfactory.cpp
index 587722a35..afcd2a3a6 100644
--- a/src/render/io/qsceneimportfactory.cpp
+++ b/src/render/io/qsceneimportfactory.cpp
@@ -50,46 +50,14 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DRender {
 
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, (QSceneImportFactoryInterface_iid, QLatin1String("/sceneparsers"), Qt::CaseInsensitive))
-#ifndef QT_NO_LIBRARY
-Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, directLoader, (QSceneImportFactoryInterface_iid, QLatin1String(""), Qt::CaseInsensitive))
-#endif
 
-QStringList QSceneImportFactory::keys(const QString &pluginPath)
+QStringList QSceneImportFactory::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() << QSceneImporter::tr("Cannot query QSceneImporter plugins at %1. "
-                                         "Library loading is disabled.").arg(pluginPath);
-#endif
-    }
-    list.append(loader()->keyMap().values());
-    return list;
+    return loader->keyMap().values();
 }
 
-QSceneImporter *QSceneImportFactory::create(const QString &name, const QStringList &args, const QString &pluginPath)
+QSceneImporter *QSceneImportFactory::create(const QString &name, const QStringList &args)
 {
-    if (!pluginPath.isEmpty()) {
-#if QT_CONFIG(library)
-        QCoreApplication::addLibraryPath(pluginPath);
-        if (QSceneImporter *ret = qLoadPlugin<QSceneImporter, QSceneImportPlugin>(directLoader(), name, args))
-            return ret;
-#else
-        qWarning() << QSceneImporter::tr("Cannot load QSceneImporter plugin from %1. "
-                                         "Library loading is disabled.").arg(pluginPath);
-#endif
-    }
     return qLoadPlugin<QSceneImporter, QSceneImportPlugin>(loader(), name, args);
 }
 
diff --git a/src/render/io/qsceneimportfactory_p.h b/src/render/io/qsceneimportfactory_p.h
index 8409ea96d..09b609de1 100644
--- a/src/render/io/qsceneimportfactory_p.h
+++ b/src/render/io/qsceneimportfactory_p.h
@@ -63,8 +63,8 @@ class QSceneImporter;
 class Q_3DRENDERSHARED_PRIVATE_EXPORT QSceneImportFactory
 {
 public:
-    static QStringList keys(const QString &pluginPath = QString());
-    static QSceneImporter *create(const QString &name, const QStringList &args, const QString &pluginPath = QString());
+    static QStringList keys();
+    static QSceneImporter *create(const QString &name, const QStringList &args);
 };
 
 } // namespace Qt3DRender