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>

31 files changed, 136 insertions, 6 deletions

diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.cpp b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.cpp
index f1e14c10c..5a80681cc 100644
--- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.cpp
+++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.cpp
@@ -52,6 +52,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandBrcmEglIntegration::QWaylandBrcmEglIntegration()
     : m_waylandDisplay(0)
 {
@@ -125,4 +127,6 @@ EGLDisplay QWaylandBrcmEglIntegration::eglDisplay() const
     return m_eglDisplay;
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h
index 7f573cb91..5699803b2 100644
--- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h
+++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h
@@ -52,12 +52,15 @@
 
 #include <QtCore/qglobal.h>
 
+struct qt_brcm;
+
 QT_BEGIN_NAMESPACE
 
-class QWaylandWindow;
 class QWindow;
 
-struct qt_brcm;
+namespace QtWaylandClient {
+
+class QWaylandWindow;
 
 class QWaylandBrcmEglIntegration : public QWaylandClientBufferIntegration
 {
@@ -90,6 +93,8 @@ private:
     EGLDisplay m_eglDisplay;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDBRCMEGLINTEGRATION_H
diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp
index 3ca72a772..2fe4e0a56 100644
--- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp
+++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp
@@ -58,6 +58,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandBrcmBuffer : public QWaylandBuffer
 {
 public:
@@ -264,4 +266,6 @@ bool QWaylandBrcmEglWindow::makeCurrent(EGLContext context)
     return eglMakeCurrent(m_eglIntegration->eglDisplay(), m_eglSurfaces[m_current], m_eglSurfaces[m_current], context);
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h
index bc8f12d1f..8c240c897 100644
--- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h
+++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h
@@ -51,6 +51,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandGLContext;
 class QWaylandBrcmBuffer;
 
@@ -93,6 +95,8 @@ private:
     QMutex m_mutex;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDBRCMEGLWINDOW_H
diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.cpp b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.cpp
index 85b7b49f0..d5af81a90 100644
--- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.cpp
+++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.cpp
@@ -52,6 +52,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 extern QSurfaceFormat brcmFixFormat(const QSurfaceFormat &format);
 
 QWaylandBrcmGLContext::QWaylandBrcmGLContext(EGLDisplay eglDisplay, const QSurfaceFormat &format, QPlatformOpenGLContext *share)
@@ -102,4 +104,6 @@ EGLConfig QWaylandBrcmGLContext::eglConfig() const
     return m_config;
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h
index a66c0a601..ac8d2f56d 100644
--- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h
+++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h
@@ -50,6 +50,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandWindow;
 class QWaylandGLWindowSurface;
 
@@ -78,6 +80,8 @@ private:
     QSurfaceFormat m_format;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDBRCMGLCONTEXT_H
diff --git a/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.cpp b/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.cpp
index ac9691147..1bb948789 100644
--- a/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.cpp
+++ b/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.cpp
@@ -48,6 +48,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 DrmServerBuffer::DrmServerBuffer(DrmEglServerBufferIntegration *integration
                                 , int32_t name
                                 , int32_t width
@@ -165,4 +167,6 @@ void DrmEglServerBufferIntegration::drm_egl_server_buffer_server_buffer_created(
     qt_server_buffer_set_user_data(id, server_buffer);
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h b/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h
index f74b8aca5..12ff194bb 100644
--- a/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h
+++ b/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h
@@ -64,6 +64,8 @@ typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target,
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class DrmEglServerBufferIntegration;
 
 class DrmServerBuffer : public QWaylandServerBuffer
@@ -126,6 +128,9 @@ void DrmEglServerBufferIntegration::glEGLImageTargetTexture2DOES (GLenum target,
     }
     m_gl_egl_image_target_texture(target,image);
 }
+
+}
+
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.cpp b/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.cpp
index a723ae591..6f3acd0ac 100644
--- a/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.cpp
+++ b/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.cpp
@@ -49,6 +49,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 LibHybrisServerBuffer::LibHybrisServerBuffer(LibHybrisEglServerBufferIntegration *integration
                                             , int32_t numFds
                                             , wl_array *ints
@@ -178,4 +180,6 @@ void LibHybrisEglServerBufferIntegration::libhybris_egl_server_buffer_server_buf
     qt_server_buffer_set_user_data(qid, server_buffer);
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h b/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h
index dd334bd2f..a9dd6e61f 100644
--- a/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h
+++ b/src/hardwareintegration/client/libhybris-egl-server/libhybriseglserverbufferintegration.h
@@ -68,6 +68,8 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLHYBRISCREATEREMOTEBUFFERPROC)(EGLint widt
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class LibHybrisEglServerBufferIntegration;
 
 class LibHybrisServerBuffer : public QWaylandServerBuffer, public QtWayland::qt_libhybris_buffer
@@ -153,6 +155,9 @@ EGLBoolean LibHybrisEglServerBufferIntegration::eglHybrisCreateRemoteBuffer(EGLi
     }
     return m_egl_create_buffer(width, height, usage, format, stride, num_ints, ints, num_fds, fds, buffer);
 }
+
+}
+
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp
index 7457ae52e..827fe07fe 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp
@@ -50,6 +50,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 static const char *qwaylandegl_threadedgl_blacklist_vendor[] = {
     "Mesa Project",
     0
@@ -161,4 +163,6 @@ EGLDisplay QWaylandEglClientBufferIntegration::eglDisplay() const
     return m_eglDisplay;
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.h b/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.h
index 465ecc751..2787b4823 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.h
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.h
@@ -48,9 +48,12 @@
 
 QT_BEGIN_NAMESPACE
 
-class QWaylandWindow;
 class QWindow;
 
+namespace QtWaylandClient {
+
+class QWaylandWindow;
+
 class QWaylandEglClientBufferIntegration : public QWaylandClientBufferIntegration
 {
 public:
@@ -79,4 +82,6 @@ private:
 
 QT_END_NAMESPACE
 
+}
+
 #endif // QWAYLANDEGLINTEGRATION_H
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandegldisplay.h b/src/hardwareintegration/client/wayland-egl/qwaylandegldisplay.h
index 4eadacca2..63d30e4a1 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandegldisplay.h
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandegldisplay.h
@@ -48,6 +48,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandEglDisplay : public QWaylandDisplay
 {
 public:
@@ -57,4 +59,6 @@ public:
     { }
 };
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
index 473e7d51d..5c5839eaa 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
@@ -54,6 +54,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandEglWindow::QWaylandEglWindow(QWindow *window)
     : QWaylandWindow(window)
     , m_clientBufferIntegration(static_cast<QWaylandEglClientBufferIntegration *>(mDisplay->clientBufferIntegration()))
@@ -198,4 +200,6 @@ void QWaylandEglWindow::bindContentFBO()
     }
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
index 298dd7d25..938f76097 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
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
index 52baaf30c..397b18dfb 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
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h
index 5528eca7d..d187c609b 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h
@@ -50,10 +50,13 @@
 
 QT_BEGIN_NAMESPACE
 
-class QWaylandWindow;
-class QWaylandGLWindowSurface;
 class QOpenGLShaderProgram;
 class QOpenGLTextureCache;
+
+namespace QtWaylandClient {
+
+class QWaylandWindow;
+class QWaylandGLWindowSurface;
 class DecorationsBlitter;
 
 class QWaylandGLContext : public QPlatformOpenGLContext
@@ -94,6 +97,8 @@ private:
     friend class DecorationsBlitter;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDGLCONTEXT_H
diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.cpp b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.cpp
index fbb715df1..e98169ab5 100644
--- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.cpp
+++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.cpp
@@ -52,6 +52,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandXCompositeEGLClientBufferIntegration::QWaylandXCompositeEGLClientBufferIntegration()
     : QWaylandClientBufferIntegration()
     , mWaylandDisplay(0)
@@ -149,4 +151,6 @@ void QWaylandXCompositeEGLClientBufferIntegration::rootInformation(void *data, q
     qDebug() << "ROOT INFORMATION" << integration->mDisplay << integration->mRootWindow << integration->mScreen;
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h
index 1d0f71fb3..23915ed13 100644
--- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h
+++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h
@@ -69,6 +69,8 @@ struct qt_xcomposite_listener;
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandXCompositeEGLClientBufferIntegration : public QWaylandClientBufferIntegration
 {
 public:
@@ -110,6 +112,8 @@ private:
                  uint32_t root_window);
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDXCOMPOSITEEGLCLIENTBUFFERINTEGRATION_H
diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.cpp b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.cpp
index 1c0e58a34..dd9a21c53 100644
--- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.cpp
+++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.cpp
@@ -50,6 +50,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandXCompositeEGLContext::QWaylandXCompositeEGLContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, EGLDisplay display, EGLConfig config)
     : QEGLPlatformContext(format, share, display, &config)
 {
@@ -75,4 +77,6 @@ EGLSurface QWaylandXCompositeEGLContext::eglSurfaceForPlatformSurface(QPlatformS
     return static_cast<QWaylandXCompositeEGLWindow *>(surface)->eglSurface();
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.h b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.h
index 7a503a7d8..41a42bded 100644
--- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.h
+++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.h
@@ -50,6 +50,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandXCompositeEGLWindow;
 
 class QWaylandXCompositeEGLContext : public QEGLPlatformContext
@@ -63,6 +65,8 @@ private:
     EGLSurface eglSurfaceForPlatformSurface(QPlatformSurface *surface);
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDXCOMPOSITEEGLCONTEXT_H
diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp
index 01d632411..e5d9a9b69 100644
--- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp
+++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp
@@ -54,6 +54,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandXCompositeEGLWindow::QWaylandXCompositeEGLWindow(QWindow *window, QWaylandXCompositeEGLClientBufferIntegration *glxIntegration)
     : QWaylandWindow(window)
     , m_glxIntegration(glxIntegration)
@@ -133,4 +135,6 @@ void QWaylandXCompositeEGLWindow::createEglSurface()
                                            size);
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h
index b45beaa24..a53ca0575 100644
--- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h
+++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h
@@ -50,6 +50,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandXCompositeEGLWindow : public QWaylandWindow
 {
 public:
@@ -74,6 +76,8 @@ private:
     EGLSurface m_surface;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDXCOMPOSITEEGLWINDOW_H
diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.cpp b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.cpp
index d4fd2c743..9435387f5 100644
--- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.cpp
+++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.cpp
@@ -49,6 +49,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandXCompositeGLXContext::QWaylandXCompositeGLXContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, Display *display, int screen)
     : m_display(display),
       m_format(format)
@@ -106,4 +108,6 @@ QSurfaceFormat QWaylandXCompositeGLXContext::format() const
     return m_format;
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h
index de0311262..328752f0d 100644
--- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h
+++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h
@@ -49,6 +49,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandXCompositeGLXWindow;
 class QWaylandShmBuffer;
 
@@ -73,6 +75,8 @@ private:
     QSurfaceFormat m_format;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDXCOMPOSITEGLXCONTEXT_H
diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.cpp b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.cpp
index 61edd0531..86e8b5c55 100644
--- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.cpp
+++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.cpp
@@ -51,6 +51,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandXCompositeGLXIntegration::QWaylandXCompositeGLXIntegration()
     : mWaylandDisplay(0)
     , mWaylandComposite(0)
@@ -138,4 +140,6 @@ void QWaylandXCompositeGLXIntegration::rootInformation(void *data, qt_xcomposite
     integration->mScreen = XDefaultScreen(integration->mDisplay);
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h
index 7ee1d9467..9c582b555 100644
--- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h
+++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h
@@ -64,6 +64,8 @@ struct qt_xcomposite_listener;
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandXCompositeGLXIntegration : public QWaylandClientBufferIntegration
 {
 public:
@@ -103,6 +105,8 @@ private:
                  uint32_t root_window);
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDXCOMPOSITEGLXINTEGRATION_H
diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.cpp b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.cpp
index 899ed7649..9e696e9fe 100644
--- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.cpp
+++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.cpp
@@ -51,6 +51,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandXCompositeGLXWindow::QWaylandXCompositeGLXWindow(QWindow *window, QWaylandXCompositeGLXIntegration *glxIntegration)
     : QWaylandWindow(window)
     , m_glxIntegration(glxIntegration)
@@ -117,4 +119,6 @@ void QWaylandXCompositeGLXWindow::createSurface()
                                             size);
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h
index 6fe99466d..e3fd90853 100644
--- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h
+++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxwindow.h
@@ -52,6 +52,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandXCompositeGLXWindow : public QWaylandWindow
 {
 public:
@@ -73,6 +75,8 @@ private:
     GLXFBConfig m_config;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDXCOMPOSITEGLXWINDOW_H
diff --git a/src/hardwareintegration/client/xcomposite_share/qwaylandxcompositebuffer.cpp b/src/hardwareintegration/client/xcomposite_share/qwaylandxcompositebuffer.cpp
index 94a9772ad..6aa27adbf 100644
--- a/src/hardwareintegration/client/xcomposite_share/qwaylandxcompositebuffer.cpp
+++ b/src/hardwareintegration/client/xcomposite_share/qwaylandxcompositebuffer.cpp
@@ -46,6 +46,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandXCompositeBuffer::QWaylandXCompositeBuffer(qt_xcomposite *xcomposite, uint32_t window, const QSize &size)
     :mSize(size)
 {
@@ -60,4 +62,6 @@ QSize QWaylandXCompositeBuffer::size() const
     return mSize;
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/hardwareintegration/client/xcomposite_share/qwaylandxcompositebuffer.h b/src/hardwareintegration/client/xcomposite_share/qwaylandxcompositebuffer.h
index a2f421666..7161cad5d 100644
--- a/src/hardwareintegration/client/xcomposite_share/qwaylandxcompositebuffer.h
+++ b/src/hardwareintegration/client/xcomposite_share/qwaylandxcompositebuffer.h
@@ -50,6 +50,8 @@ struct wl_visual;
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandXCompositeBuffer : public QWaylandBuffer
 {
 public:
@@ -62,6 +64,8 @@ private:
     QSize mSize;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDXCOMPOSITEBUFFER_H