summaryrefslogtreecommitdiffstats
path: root/src/plugins/hardwareintegration/compositor/xcomposite-egl
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/hardwareintegration/compositor/xcomposite-egl')
-rw-r--r--src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp16
-rw-r--r--src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.json2
2 files changed, 4 insertions, 14 deletions
diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp b/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp
index 4ae206fa2..f0bbedaa7 100644
--- a/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp
+++ b/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp
@@ -49,24 +49,14 @@ class QWaylandXCompositeClientBufferIntegration : public QtWayland::ClientBuffer
Q_OBJECT
Q_PLUGIN_METADATA(IID QtWaylandClientBufferIntegrationFactoryInterface_iid FILE "xcomposite-egl.json")
public:
- QStringList keys() const;
- QtWayland::ClientBufferIntegration *create(const QString&, const QStringList&);
+ QtWayland::ClientBufferIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE;
};
-QStringList QWaylandXCompositeClientBufferIntegration::keys() const
-{
- QStringList list;
- list << "wayland-xcomposite";
- return list;
-}
-
QtWayland::ClientBufferIntegration *QWaylandXCompositeClientBufferIntegration::create(const QString& system, const QStringList& paramList)
{
Q_UNUSED(paramList);
- if (system.toLower() == "wayland-xcomposite")
- return new XCompositeEglClientBufferIntegration();
-
- return 0;
+ Q_UNUSED(system);
+ return new XCompositeEglClientBufferIntegration();
}
QT_END_NAMESPACE
diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.json b/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.json
index 8ccd5b46b..0d119ff85 100644
--- a/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.json
+++ b/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.json
@@ -1,3 +1,3 @@
{
- "Keys": [ "wayland-xcomposite" ]
+ "Keys": [ "xcomposite-egl" ]
}