summaryrefslogtreecommitdiffstats
path: root/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
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/qwaylandglcontext.cpp
parent1db1fa1619e718eebdc88899df6c0a8c6d2309b9 (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/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp')
-rw-r--r--src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
index 52baaf30..397b18df 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
@@ -103,6 +103,8 @@
QT_BEGIN_NAMESPACE
+namespace QtWaylandClient {
+
class DecorationsBlitter : public QOpenGLFunctions
{
public:
@@ -547,4 +549,6 @@ EGLConfig QWaylandGLContext::eglConfig() const
return m_config;
}
+}
+
QT_END_NAMESPACE