diff options
author | Giulio Camuffo <giulio.camuffo@jollamobile.com> | 2015-01-29 14:35:44 +0200 |
---|---|---|
committer | Giulio Camuffo <giulio.camuffo@jollamobile.com> | 2015-01-29 12:53:04 +0000 |
commit | e6255beec9114afd1fad9e7d62ebec433a627d54 (patch) | |
tree | e03655b01f480e4e82686ad02318f241a21f0002 /src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h | |
parent | 1db1fa1619e718eebdc88899df6c0a8c6d2309b9 (diff) |
Namespace the platform plugins
There currently is a QWaylandInputDevice class both in the wayland QPA
plugin and in the QtCompositor API. This causes the qwindow-compositor
example to crash when running nested in a wayland session due to a
mismatch between the two classes.
By namespacing all the plugin code we make sure that name clashes
will not happen anymore.
Change-Id: I17497cff697599200bea68bf01dfde474526390f
Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
Diffstat (limited to 'src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h')
-rw-r--r-- | src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h b/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h index a7308f643..7825e2cfe 100644 --- a/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h +++ b/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h @@ -47,6 +47,10 @@ #include "qwaylandxcompositeglxintegration.h" +QT_BEGIN_NAMESPACE + +namespace QtWaylandClient { + class QWaylandXCompositeGlxPlatformIntegration : public QWaylandIntegration { public: @@ -64,4 +68,8 @@ private: QWaylandClientBufferIntegration *m_client_buffer_integration; }; +} + +QT_END_NAMESPACE + #endif |