From 043a2893c41bbe0daa8953e9e30dd6957f216d95 Mon Sep 17 00:00:00 2001 From: Jorgen Lind Date: Mon, 10 Mar 2014 14:31:55 +0100 Subject: Take advantage of the Qt 5 plugin json structure Also change naming scheme of plugins: buffer integrations doesn't start with "wayland-" but the platform plugins have to start with "wayland-". Also update the README Change-Id: I6dd2103ab287ed569ab06cfb6eb469e3db058831 Reviewed-by: Laszlo Agocs --- .../hardwareintegration/compositor/wayland-egl/main.cpp | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp') diff --git a/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp b/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp index 274dff1e6..3a7984f0a 100644 --- a/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp +++ b/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp @@ -50,24 +50,14 @@ class QWaylandIntegrationPlugin : public QtWayland::ClientBufferIntegrationPlugi Q_OBJECT Q_PLUGIN_METADATA(IID QtWaylandClientBufferIntegrationFactoryInterface_iid FILE "wayland-egl.json") public: - QStringList keys() const; - QtWayland::ClientBufferIntegration *create(const QString&, const QStringList&); + QtWayland::ClientBufferIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; }; -QStringList QWaylandIntegrationPlugin::keys() const -{ - QStringList list; - list << "wayland-egl"; - return list; -} - QtWayland::ClientBufferIntegration *QWaylandIntegrationPlugin::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); - if (system.toLower() == "wayland-egl") - return new WaylandEglClientBufferIntegration(); - - return 0; + Q_UNUSED(system); + return new WaylandEglClientBufferIntegration(); } QT_END_NAMESPACE -- cgit v1.2.3