summaryrefslogtreecommitdiff
path: root/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
diff options
context:
space:
mode:
authorGiulio Camuffo <giulio.camuffo@jollamobile.com>2015-01-29 14:35:44 +0200
committerGiulio Camuffo <giulio.camuffo@jollamobile.com>2015-01-29 12:53:04 +0000
commite6255beec9114afd1fad9e7d62ebec433a627d54 (patch)
treee03655b01f480e4e82686ad02318f241a21f0002 /src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
parent1db1fa1619e718eebdc88899df6c0a8c6d2309b9 (diff)
downloadqtwayland-e6255beec9114afd1fad9e7d62ebec433a627d54.tar.gz
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/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h')
-rw-r--r--src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
index 298dd7d2..938f7609 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
@@ -48,9 +48,12 @@
QT_BEGIN_NAMESPACE
-class QWaylandGLContext;
class QOpenGLFramebufferObject;
+namespace QtWaylandClient {
+
+class QWaylandGLContext;
+
class QWaylandEglWindow : public QWaylandWindow
{
public:
@@ -86,6 +89,8 @@ private:
QSurfaceFormat m_format;
};
+}
+
QT_END_NAMESPACE
#endif // QWAYLANDEGLWINDOW_H