Q*FActory: remove unused path arguments6.2.46.2.36.2.26.2

Cargo-culted from somewhere but not used here. This just made the code
bigger for no reason.

Task-number: QTBUG-97950
Change-Id: Ice04365c72984d07a64dfffd16b48632888ed664
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit 2e0c1b826162ba19783d2a3adbb66e1991fef8ad)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

2 files changed, 6 insertions, 40 deletions

diff --git a/src/gamepad/qgamepadbackendfactory.cpp b/src/gamepad/qgamepadbackendfactory.cpp
index 988de68..a899cf0 100644
--- a/src/gamepad/qgamepadbackendfactory.cpp
+++ b/src/gamepad/qgamepadbackendfactory.cpp
@@ -46,49 +46,15 @@
 QT_BEGIN_NAMESPACE
 
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, (QtGamepadBackendFactoryInterface_iid, QLatin1String("/gamepads"), Qt::CaseInsensitive))
-#if QT_CONFIG(library)
-Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, directLoader, (QtGamepadBackendFactoryInterface_iid, QLatin1String(""), Qt::CaseInsensitive))
-#endif
 
-QStringList QGamepadBackendFactory::keys(const QString &pluginPath)
+QStringList QGamepadBackendFactory::keys()
 {
-    QStringList list;
-    if (!pluginPath.isEmpty()) {
-#if QT_CONFIG(library)
-        QCoreApplication::addLibraryPath(pluginPath);
-        list = directLoader()->keyMap().values();
-        if (!list.isEmpty()) {
-            const QString postFix = QStringLiteral(" (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("Cannot query QGamepadBackend plugins at %s: Library loading is disabled.",
-                 pluginPath.toLocal8Bit().constData());
-#endif
-    }
-    list.append(loader()->keyMap().values());
-    return list;
+    return loader->keyMap().values();
 }
 
-QGamepadBackend *QGamepadBackendFactory::create(const QString &name, const QStringList &args, const QString &pluginPath)
+QGamepadBackend *QGamepadBackendFactory::create(const QString &name, const QStringList &args)
 {
-    if (!pluginPath.isEmpty()) {
-#if QT_CONFIG(library)
-        QCoreApplication::addLibraryPath(pluginPath);
-        if (QGamepadBackend *ret = qLoadPlugin<QGamepadBackend, QGamepadBackendPlugin>(directLoader(), name, args))
-            return ret;
-#else
-        qWarning("Cannot load QGamepadBackend plugin from %s. Library loading is disabled.",
-                 pluginPath.toLocal8Bit().constData());
-#endif
-    }
-    if (QGamepadBackend *ret = qLoadPlugin<QGamepadBackend, QGamepadBackendPlugin>(loader(), name, args))
-        return ret;
-    return 0;
+    return qLoadPlugin<QGamepadBackend, QGamepadBackendPlugin>(loader(), name, args);
 }
 
 QT_END_NAMESPACE
diff --git a/src/gamepad/qgamepadbackendfactory_p.h b/src/gamepad/qgamepadbackendfactory_p.h
index 184fed4..8b2b3a5 100644
--- a/src/gamepad/qgamepadbackendfactory_p.h
+++ b/src/gamepad/qgamepadbackendfactory_p.h
@@ -58,8 +58,8 @@ class QGamepadBackend;
 class Q_GAMEPAD_EXPORT QGamepadBackendFactory
 {
 public:
-    static QStringList keys(const QString &pluginPath = QString());
-    static QGamepadBackend *create(const QString &name, const QStringList &args, const QString &pluginPath = QString());
+    static QStringList keys();
+    static QGamepadBackend *create(const QString &name, const QStringList &args);
 };
 
 QT_END_NAMESPACE