summaryrefslogtreecommitdiffstats
path: root/src/plugins/hardwareintegration/compositor/drm-egl-server/main.cpp
diff options
context:
space:
mode:
authorJorgen Lind <jorgen.lind@digia.com>2014-03-10 14:31:55 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-11 15:35:18 +0100
commit043a2893c41bbe0daa8953e9e30dd6957f216d95 (patch)
tree605fef066399c3678a34d6d442a20281d1c3bcd1 /src/plugins/hardwareintegration/compositor/drm-egl-server/main.cpp
parent6b173d993542e2aed01b5a97d3e0fb64940ad432 (diff)
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 <laszlo.agocs@digia.com>
Diffstat (limited to 'src/plugins/hardwareintegration/compositor/drm-egl-server/main.cpp')
-rw-r--r--src/plugins/hardwareintegration/compositor/drm-egl-server/main.cpp16
1 files changed, 3 insertions, 13 deletions
diff --git a/src/plugins/hardwareintegration/compositor/drm-egl-server/main.cpp b/src/plugins/hardwareintegration/compositor/drm-egl-server/main.cpp
index 4bfc1b483..e85f93009 100644
--- a/src/plugins/hardwareintegration/compositor/drm-egl-server/main.cpp
+++ b/src/plugins/hardwareintegration/compositor/drm-egl-server/main.cpp
@@ -49,24 +49,14 @@ class DrmEglServerBufferIntegrationPlugin : public QtWayland::ServerBufferIntegr
Q_OBJECT
Q_PLUGIN_METADATA(IID QtWaylandServerBufferIntegrationFactoryInterface_iid FILE "drm-egl-server.json")
public:
- QStringList keys() const;
- QtWayland::ServerBufferIntegration *create(const QString&, const QStringList&);
+ QtWayland::ServerBufferIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;
};
-QStringList DrmEglServerBufferIntegrationPlugin::keys() const
-{
- QStringList list;
- list << "drm-egl-server";
- return list;
-}
-
QtWayland::ServerBufferIntegration *DrmEglServerBufferIntegrationPlugin::create(const QString& system, const QStringList& paramList)
{
Q_UNUSED(paramList);
- if (system.toLower() == "drm-egl-server")
- return new DrmEglServerBufferIntegration();
-
- return 0;
+ Q_UNUSED(system);
+ return new DrmEglServerBufferIntegration();
}
QT_END_NAMESPACE