diff options
| author | Jorgen Lind <jorgen.lind@digia.com> | 2014-03-10 09:25:04 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-11 15:35:08 +0100 |
| commit | 6b173d993542e2aed01b5a97d3e0fb64940ad432 (patch) | |
| tree | d9a3e3376917b9fa21c64d6a325e57fb5c8e0b22 /src/plugins/hardwareintegration | |
| parent | a9d9fa463cd6b915fd4fda7e06317b5299c893e7 (diff) | |
Fixup for GLX integration
Change-Id: I2de94481f7d3e109fdce7ca961f8969299cf5d9e
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Diffstat (limited to 'src/plugins/hardwareintegration')
| -rw-r--r-- | src/plugins/hardwareintegration/client/xcomposite-glx/main.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.json | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/hardwareintegration/client/xcomposite-glx/main.cpp b/src/plugins/hardwareintegration/client/xcomposite-glx/main.cpp index f53caf03a..2d402194e 100644 --- a/src/plugins/hardwareintegration/client/xcomposite-glx/main.cpp +++ b/src/plugins/hardwareintegration/client/xcomposite-glx/main.cpp @@ -56,14 +56,14 @@ public: QStringList QWaylandXCompositeGlxClientBufferIntegrationPlugin::keys() const { QStringList list; - list << "xcomposite-glx"; + list << "wayland-xcomposite-glx"; return list; } QWaylandClientBufferIntegration *QWaylandXCompositeGlxClientBufferIntegrationPlugin::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); - if (system.toLower() == "xcomposite-glx") + if (system.toLower() == "wayland-xcomposite-glx") return new QWaylandXCompositeGLXIntegration(); return 0; diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.json b/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.json index 8ccd5b46b..0f4a3bf69 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.json +++ b/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.json @@ -1,3 +1,3 @@ { - "Keys": [ "wayland-xcomposite" ] + "Keys": [ "wayland-xcomposite-glx" ] } |