diff options
Diffstat (limited to 'src/plugins/platforms/xcb/gl_integrations')
-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 |