diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2021-11-04 19:22:20 -0700 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2021-11-10 10:21:43 -0800 |
commit | 3ba1a196aaac8f480c0fcb4fc005c1f4e7d7f88b (patch) | |
tree | 81b7054fb0fb212549db0b004d8a677114fe10f8 /src/plugins/platforms/xcb | |
parent | b0dc6abfb214667e6359a0b55006fb31baf709a7 (diff) |
Q{XcbGl,EglFSDevice}IntegrationFactory: remove unused extra plugin path
Cargo-cult copied this from somewhere, unnecessarily. This just made the
code bigger for no reason.
Task-number: QTBUG-97950
Pick-to: 6.2
Change-Id: Ice04365c72984d07a64dfffd16b48520d42c7043
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/plugins/platforms/xcb')
-rw-r--r-- | src/plugins/platforms/xcb/gl_integrations/qxcbglintegrationfactory.cpp | 17 | ||||
-rw-r--r-- | src/plugins/platforms/xcb/gl_integrations/qxcbglintegrationfactory.h | 2 |
2 files changed, 2 insertions, 17 deletions
diff --git a/src/plugins/platforms/xcb/gl_integrations/qxcbglintegrationfactory.cpp b/src/plugins/platforms/xcb/gl_integrations/qxcbglintegrationfactory.cpp index d69d969783..8412663e3c 100644 --- a/src/plugins/platforms/xcb/gl_integrations/qxcbglintegrationfactory.cpp +++ b/src/plugins/platforms/xcb/gl_integrations/qxcbglintegrationfactory.cpp @@ -50,23 +50,8 @@ QT_BEGIN_NAMESPACE Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, (QXcbGlIntegrationFactoryInterface_iid, QLatin1String("/xcbglintegrations"), Qt::CaseInsensitive)) -#if QT_CONFIG(library) -Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, directLoader, - (QXcbGlIntegrationFactoryInterface_iid, QLatin1String(""), Qt::CaseInsensitive)) -#endif // QT_CONFIG(library) - -QXcbGlIntegration *QXcbGlIntegrationFactory::create(const QString &platform, const QString &pluginPath) +QXcbGlIntegration *QXcbGlIntegrationFactory::create(const QString &platform) { -#if QT_CONFIG(library) - // Try loading the plugin from pluginPath first: - if (!pluginPath.isEmpty()) { - QCoreApplication::addLibraryPath(pluginPath); - if (QXcbGlIntegration *ret = qLoadPlugin<QXcbGlIntegration, QXcbGlIntegrationPlugin>(directLoader(), platform)) - return ret; - } -#else - Q_UNUSED(pluginPath); -#endif return qLoadPlugin<QXcbGlIntegration, QXcbGlIntegrationPlugin>(loader(), platform); } diff --git a/src/plugins/platforms/xcb/gl_integrations/qxcbglintegrationfactory.h b/src/plugins/platforms/xcb/gl_integrations/qxcbglintegrationfactory.h index c4aa0a3d8d..30ddeb2297 100644 --- a/src/plugins/platforms/xcb/gl_integrations/qxcbglintegrationfactory.h +++ b/src/plugins/platforms/xcb/gl_integrations/qxcbglintegrationfactory.h @@ -49,7 +49,7 @@ class QXcbGlIntegration; class QXcbGlIntegrationFactory { public: - static QXcbGlIntegration *create(const QString &name, const QString &platformPluginPath = QString()); + static QXcbGlIntegration *create(const QString &name); }; QT_END_NAMESPACE |