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>
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
parent: 1db1fa1619e718eebdc88899df6c0a8c6d2309b9 (diff)
135 files changed, 583 insertions, 34 deletions
diff --git a/examples/wayland/server-buffer/client/main.cpp b/examples/wayland/server-buffer/client/main.cpp
index 54c586ce6..c15a091c0 100644
--- a/examples/wayland/server-buffer/client/main.cpp
+++ b/examples/wayland/server-buffer/client/main.cpp
@@ -83,7 +83,7 @@ public:
             return;
         }
 
-        QWaylandIntegration *wayland_integration = static_cast<QWaylandIntegration *>(QGuiApplicationPrivate::platformIntegration());
+        QtWaylandClient::QWaylandIntegration *wayland_integration = static_cast<QtWaylandClient::QWaylandIntegration *>(QGuiApplicationPrivate::platformIntegration());
 
         m_server_buffer_integration = wayland_integration->serverBufferIntegration();
         if (!m_server_buffer_integration) {
@@ -93,7 +93,7 @@ public:
         }
 
 
-        QWaylandDisplay *wayland_display = wayland_integration->display();
+        QtWaylandClient::QWaylandDisplay *wayland_display = wayland_integration->display();
         struct ::wl_registry *registry = wl_display_get_registry(wayland_display->wl_display());
         wl_proxy_set_queue(reinterpret_cast<struct wl_proxy *>(registry), wayland_display->wl_event_queue());
         QtWayland::wl_registry::init(registry);
@@ -155,7 +155,7 @@ protected:
 
     void share_buffer_cross_buffer(struct ::qt_server_buffer *buffer) Q_DECL_OVERRIDE
     {
-        QWaylandServerBuffer *serverBuffer = m_server_buffer_integration->serverBuffer(buffer);
+        QtWaylandClient::QWaylandServerBuffer *serverBuffer = m_server_buffer_integration->serverBuffer(buffer);
         if (m_server_buffer_list.isEmpty()) {
             setWidth(serverBuffer->size().width());
             setHeight(serverBuffer->size().height());
@@ -168,8 +168,8 @@ protected:
     }
 
 private:
-    QWaylandServerBufferIntegration *m_server_buffer_integration;
-    QList<QWaylandServerBuffer *>m_server_buffer_list;
+    QtWaylandClient::QWaylandServerBufferIntegration *m_server_buffer_integration;
+    QList<QtWaylandClient::QWaylandServerBuffer *>m_server_buffer_list;
     GLuint m_server_buffer_texture;
     QOpenGLContext *m_context;
     QOpenGLVertexArrayObject *m_vao;
diff --git a/examples/wayland/server-buffer/client/serverbufferrenderer.cpp b/examples/wayland/server-buffer/client/serverbufferrenderer.cpp
index 2f0d204d3..732f746a2 100644
--- a/examples/wayland/server-buffer/client/serverbufferrenderer.cpp
+++ b/examples/wayland/server-buffer/client/serverbufferrenderer.cpp
@@ -74,7 +74,7 @@ static const char fragment_shader[] =
     "   gl_FragColor = texture2D(textureSampler, uv);"
     "}";
 
-ServerBufferRenderer::ServerBufferRenderer(QWaylandServerBuffer *serverBuffer)
+ServerBufferRenderer::ServerBufferRenderer(QtWaylandClient::QWaylandServerBuffer *serverBuffer)
     : QOpenGLFunctions(QOpenGLContext::currentContext())
     , m_server_buffer(serverBuffer)
     , m_texture(0)
diff --git a/examples/wayland/server-buffer/client/serverbufferrenderer.h b/examples/wayland/server-buffer/client/serverbufferrenderer.h
index 7e8999b1c..4fd5e06fa 100644
--- a/examples/wayland/server-buffer/client/serverbufferrenderer.h
+++ b/examples/wayland/server-buffer/client/serverbufferrenderer.h
@@ -52,11 +52,11 @@ class QOpenGLShaderProgram;
 class ServerBufferRenderer : public QOpenGLFunctions
 {
 public:
-    ServerBufferRenderer(QWaylandServerBuffer *serverBuffer);
+    ServerBufferRenderer(QtWaylandClient::QWaylandServerBuffer *serverBuffer);
 
     void render(const QMatrix4x4 &transform);
 private:
-    QWaylandServerBuffer *m_server_buffer;
+    QtWaylandClient::QWaylandServerBuffer *m_server_buffer;
     GLuint m_texture;
 
     QOpenGLVertexArrayObject *m_vao;
diff --git a/src/client/hardwareintegration/qwaylandclientbufferintegration.cpp b/src/client/hardwareintegration/qwaylandclientbufferintegration.cpp
index 2c4d8ff1b..f60993097 100644
--- a/src/client/hardwareintegration/qwaylandclientbufferintegration.cpp
+++ b/src/client/hardwareintegration/qwaylandclientbufferintegration.cpp
@@ -43,6 +43,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandClientBufferIntegration::QWaylandClientBufferIntegration()
 {
 
@@ -53,4 +55,6 @@ QWaylandClientBufferIntegration::~QWaylandClientBufferIntegration()
 
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/client/hardwareintegration/qwaylandclientbufferintegration_p.h b/src/client/hardwareintegration/qwaylandclientbufferintegration_p.h
index 898ab2251..8c787175d 100644
--- a/src/client/hardwareintegration/qwaylandclientbufferintegration_p.h
+++ b/src/client/hardwareintegration/qwaylandclientbufferintegration_p.h
@@ -47,13 +47,15 @@
 
 QT_BEGIN_NAMESPACE
 
-class QWaylandWindow;
-class QWaylandDisplay;
 class QWindow;
-
 class QPlatformOpenGLContext;
 class QSurfaceFormat;
 
+namespace QtWaylandClient {
+
+class QWaylandWindow;
+class QWaylandDisplay;
+
 class Q_WAYLAND_CLIENT_EXPORT QWaylandClientBufferIntegration
 {
 public:
@@ -79,6 +81,8 @@ public:
     virtual void *nativeResourceForContext(NativeResource /*resource*/, QPlatformOpenGLContext */*context*/) { return Q_NULLPTR; }
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDCLIENTBUFFERINTEGRATION_H
diff --git a/src/client/hardwareintegration/qwaylandclientbufferintegrationfactory.cpp b/src/client/hardwareintegration/qwaylandclientbufferintegrationfactory.cpp
index 7f2648bcf..d0603ef22 100644
--- a/src/client/hardwareintegration/qwaylandclientbufferintegrationfactory.cpp
+++ b/src/client/hardwareintegration/qwaylandclientbufferintegrationfactory.cpp
@@ -48,6 +48,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 #ifndef QT_NO_LIBRARY
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
     (QWaylandClientBufferIntegrationFactoryInterface_iid, QLatin1String("/wayland-graphics-integration-client"), Qt::CaseInsensitive))
@@ -93,4 +95,6 @@ QWaylandClientBufferIntegration *QWaylandClientBufferIntegrationFactory::create(
     return 0;
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/client/hardwareintegration/qwaylandclientbufferintegrationfactory_p.h b/src/client/hardwareintegration/qwaylandclientbufferintegrationfactory_p.h
index 4a1c41286..25ea5805e 100644
--- a/src/client/hardwareintegration/qwaylandclientbufferintegrationfactory_p.h
+++ b/src/client/hardwareintegration/qwaylandclientbufferintegrationfactory_p.h
@@ -47,6 +47,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandClientBufferIntegration;
 
 class Q_WAYLAND_CLIENT_EXPORT QWaylandClientBufferIntegrationFactory
@@ -56,6 +58,8 @@ public:
     static QWaylandClientBufferIntegration *create(const QString &name, const QStringList &args, const QString &pluginPath = QString());
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDCLIENTBUFFERINTEGRATIONFACTORY_H
diff --git a/src/client/hardwareintegration/qwaylandclientbufferintegrationplugin.cpp b/src/client/hardwareintegration/qwaylandclientbufferintegrationplugin.cpp
index afc105106..1b362b294 100644
--- a/src/client/hardwareintegration/qwaylandclientbufferintegrationplugin.cpp
+++ b/src/client/hardwareintegration/qwaylandclientbufferintegrationplugin.cpp
@@ -43,6 +43,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandClientBufferIntegrationPlugin::QWaylandClientBufferIntegrationPlugin(QObject *parent) :
     QObject(parent)
 {
@@ -52,4 +54,6 @@ QWaylandClientBufferIntegrationPlugin::~QWaylandClientBufferIntegrationPlugin()
 {
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/client/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h b/src/client/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h
index 7f96ebc6a..a14c17810 100644
--- a/src/client/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h
+++ b/src/client/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h
@@ -50,6 +50,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandClientBufferIntegration;
 
 #define QWaylandClientBufferIntegrationFactoryInterface_iid "org.qt-project.Qt.WaylandClient.QWaylandClientBufferIntegrationFactoryInterface.5.3"
@@ -64,6 +66,8 @@ public:
     virtual QWaylandClientBufferIntegration *create(const QString &key, const QStringList &paramList) = 0;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDCLIENTBUFFERINTEGRATIONPLUGIN_H
diff --git a/src/client/hardwareintegration/qwaylandhardwareintegration.cpp b/src/client/hardwareintegration/qwaylandhardwareintegration.cpp
index 469f80360..c02eebf3a 100644
--- a/src/client/hardwareintegration/qwaylandhardwareintegration.cpp
+++ b/src/client/hardwareintegration/qwaylandhardwareintegration.cpp
@@ -44,6 +44,8 @@
 #include "qwaylanddisplay_p.h"
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandHardwareIntegration::QWaylandHardwareIntegration(struct ::wl_registry *registry, int id)
     : qt_hardware_integration(registry, id, 1)
 {
@@ -69,4 +71,6 @@ void QWaylandHardwareIntegration::hardware_integration_server_backend(const QStr
     m_server_buffer = name;
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/client/hardwareintegration/qwaylandhardwareintegration_p.h b/src/client/hardwareintegration/qwaylandhardwareintegration_p.h
index 84aa18ace..503e69b03 100644
--- a/src/client/hardwareintegration/qwaylandhardwareintegration_p.h
+++ b/src/client/hardwareintegration/qwaylandhardwareintegration_p.h
@@ -47,6 +47,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandDisplay;
 
 class Q_WAYLAND_CLIENT_EXPORT QWaylandHardwareIntegration : public QtWayland::qt_hardware_integration
@@ -66,6 +68,8 @@ private:
     QString m_server_buffer;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/client/hardwareintegration/qwaylandserverbufferintegration.cpp b/src/client/hardwareintegration/qwaylandserverbufferintegration.cpp
index 5bac68929..07780f52e 100644
--- a/src/client/hardwareintegration/qwaylandserverbufferintegration.cpp
+++ b/src/client/hardwareintegration/qwaylandserverbufferintegration.cpp
@@ -43,6 +43,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandServerBuffer::QWaylandServerBuffer()
     : m_user_data(0)
 {
@@ -79,4 +81,6 @@ QWaylandServerBufferIntegration::~QWaylandServerBufferIntegration()
 {
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/client/hardwareintegration/qwaylandserverbufferintegration_p.h b/src/client/hardwareintegration/qwaylandserverbufferintegration_p.h
index 18090a798..7732cea27 100644
--- a/src/client/hardwareintegration/qwaylandserverbufferintegration_p.h
+++ b/src/client/hardwareintegration/qwaylandserverbufferintegration_p.h
@@ -50,6 +50,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandDisplay;
 
 class Q_WAYLAND_CLIENT_EXPORT QWaylandServerBuffer
@@ -90,6 +92,8 @@ public:
     virtual QWaylandServerBuffer *serverBuffer(struct qt_server_buffer *buffer) = 0;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/client/hardwareintegration/qwaylandserverbufferintegrationfactory.cpp b/src/client/hardwareintegration/qwaylandserverbufferintegrationfactory.cpp
index 2b61dbdc8..3df77a003 100644
--- a/src/client/hardwareintegration/qwaylandserverbufferintegrationfactory.cpp
+++ b/src/client/hardwareintegration/qwaylandserverbufferintegrationfactory.cpp
@@ -48,6 +48,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 #ifndef QT_NO_LIBRARY
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
     (QWaylandServerBufferIntegrationFactoryInterface_iid, QLatin1String("/wayland-graphics-integration-client"), Qt::CaseInsensitive))
@@ -93,4 +95,6 @@ QWaylandServerBufferIntegration *QWaylandServerBufferIntegrationFactory::create(
     return 0;
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/client/hardwareintegration/qwaylandserverbufferintegrationfactory_p.h b/src/client/hardwareintegration/qwaylandserverbufferintegrationfactory_p.h
index 48e5e13d9..5fcce2ba6 100644
--- a/src/client/hardwareintegration/qwaylandserverbufferintegrationfactory_p.h
+++ b/src/client/hardwareintegration/qwaylandserverbufferintegrationfactory_p.h
@@ -47,6 +47,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandServerBufferIntegration;
 
 class Q_WAYLAND_CLIENT_EXPORT QWaylandServerBufferIntegrationFactory
@@ -56,6 +58,8 @@ public:
     static QWaylandServerBufferIntegration *create(const QString &name, const QStringList &args, const QString &pluginPath = QString());
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDSERVERBUFFERINTEGRATIONFACTORY_H
diff --git a/src/client/hardwareintegration/qwaylandserverbufferintegrationplugin.cpp b/src/client/hardwareintegration/qwaylandserverbufferintegrationplugin.cpp
index 8fc31a883..e77bec0e7 100644
--- a/src/client/hardwareintegration/qwaylandserverbufferintegrationplugin.cpp
+++ b/src/client/hardwareintegration/qwaylandserverbufferintegrationplugin.cpp
@@ -43,6 +43,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandServerBufferIntegrationPlugin::QWaylandServerBufferIntegrationPlugin(QObject *parent)
     : QObject(parent)
 {
@@ -51,4 +53,6 @@ QWaylandServerBufferIntegrationPlugin::~QWaylandServerBufferIntegrationPlugin()
 {
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/client/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h b/src/client/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h
index d5d1d78f5..f74ee1ad1 100644
--- a/src/client/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h
+++ b/src/client/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h
@@ -50,6 +50,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandServerBufferIntegration;
 
 #define QWaylandServerBufferIntegrationFactoryInterface_iid "org.qt-project.Qt.WaylandClient.QWaylandServerBufferIntegrationFactoryInterface.5.3"
@@ -64,6 +66,8 @@ public:
     virtual QWaylandServerBufferIntegration *create(const QString &key, const QStringList &paramList) = 0;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDSERVERBUFFERINTEGRATIONPLUGIN_H
diff --git a/src/client/inputdeviceintegration/qwaylandinputdeviceintegration_p.h b/src/client/inputdeviceintegration/qwaylandinputdeviceintegration_p.h
index 5fa187e69..54ead23c4 100644
--- a/src/client/inputdeviceintegration/qwaylandinputdeviceintegration_p.h
+++ b/src/client/inputdeviceintegration/qwaylandinputdeviceintegration_p.h
@@ -47,6 +47,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandDisplay;
 class QWaylandInputDevice;
 
@@ -59,6 +61,8 @@ public:
     virtual QWaylandInputDevice *createInputDevice(QWaylandDisplay *d, int version, uint32_t id) = 0;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDINPUTDEVICEINTEGRATION_H
diff --git a/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationfactory.cpp b/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationfactory.cpp
index 58a82fb2c..f9e459ed9 100644
--- a/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationfactory.cpp
+++ b/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationfactory.cpp
@@ -48,6 +48,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 #ifndef QT_NO_LIBRARY
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
     (QWaylandInputDeviceIntegrationFactoryInterface_iid, QLatin1String("/wayland-inputdevice-integration"), Qt::CaseInsensitive))
@@ -93,4 +95,6 @@ QWaylandInputDeviceIntegration *QWaylandInputDeviceIntegrationFactory::create(co
     return Q_NULLPTR;
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationfactory_p.h b/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationfactory_p.h
index 13cddc24f..74cfba8c8 100644
--- a/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationfactory_p.h
+++ b/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationfactory_p.h
@@ -47,6 +47,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandInputDeviceIntegration;
 
 class Q_WAYLAND_CLIENT_EXPORT QWaylandInputDeviceIntegrationFactory
@@ -56,6 +58,8 @@ public:
     static QWaylandInputDeviceIntegration *create(const QString &name, const QStringList &args, const QString &pluginPath = QString());
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDINPUTDEVICENTEGRATIONFACTORY_H
diff --git a/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationplugin.cpp b/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationplugin.cpp
index 71a933254..c78a09596 100644
--- a/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationplugin.cpp
+++ b/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationplugin.cpp
@@ -43,6 +43,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandInputDeviceIntegrationPlugin::QWaylandInputDeviceIntegrationPlugin(QObject *parent)
                               : QObject(parent)
 {
@@ -52,4 +54,6 @@ QWaylandInputDeviceIntegrationPlugin::~QWaylandInputDeviceIntegrationPlugin()
 {
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationplugin_p.h b/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationplugin_p.h
index a0a062f4c..9723191d8 100644
--- a/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationplugin_p.h
+++ b/src/client/inputdeviceintegration/qwaylandinputdeviceintegrationplugin_p.h
@@ -50,6 +50,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandInputDeviceIntegration;
 
 #define QWaylandInputDeviceIntegrationFactoryInterface_iid "org.qt-project.Qt.WaylandClient.QWaylandInputDeviceIntegrationFactoryInterface.5.3"
@@ -64,6 +66,8 @@ public:
     virtual QWaylandInputDeviceIntegration *create(const QString &key, const QStringList &paramList) = 0;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDINPUTDEVICEINTEGRATIONPLUGIN_H
diff --git a/src/client/qwaylandabstractdecoration.cpp b/src/client/qwaylandabstractdecoration.cpp
index e4b81bb83..6ad78aaa3 100644
--- a/src/client/qwaylandabstractdecoration.cpp
+++ b/src/client/qwaylandabstractdecoration.cpp
@@ -52,6 +52,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandAbstractDecorationPrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QWaylandAbstractDecoration)
@@ -184,4 +186,6 @@ QWaylandWindow *QWaylandAbstractDecoration::waylandWindow() const
     return d->m_wayland_window;
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/client/qwaylandabstractdecoration_p.h b/src/client/qwaylandabstractdecoration_p.h
index 6171cab14..891e67a8f 100644
--- a/src/client/qwaylandabstractdecoration_p.h
+++ b/src/client/qwaylandabstractdecoration_p.h
@@ -62,6 +62,9 @@ class QWindow;
 class QPaintDevice;
 class QPainter;
 class QEvent;
+
+namespace QtWaylandClient {
+
 class QWaylandScreen;
 class QWaylandWindow;
 class QWaylandInputDevice;
@@ -100,6 +103,8 @@ protected:
     bool isLeftReleased(Qt::MouseButtons newMouseButtonState);
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDABSTRACTDECORATION_H
diff --git a/src/client/qwaylandbuffer_p.h b/src/client/qwaylandbuffer_p.h
index 0c9903f5a..db6bbd9bb 100644
--- a/src/client/qwaylandbuffer_p.h
+++ b/src/client/qwaylandbuffer_p.h
@@ -52,6 +52,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class Q_WAYLAND_CLIENT_EXPORT QWaylandBuffer {
 public:
     QWaylandBuffer() { }
@@ -64,6 +66,8 @@ protected:
     struct wl_buffer *mBuffer;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDBUFFER_H
diff --git a/src/client/qwaylandclipboard.cpp b/src/client/qwaylandclipboard.cpp
index c40f023b5..226a374ab 100644
--- a/src/client/qwaylandclipboard.cpp
+++ b/src/client/qwaylandclipboard.cpp
@@ -48,6 +48,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandClipboard::QWaylandClipboard(QWaylandDisplay *display)
     : mDisplay(display)
 {
@@ -108,4 +110,6 @@ bool QWaylandClipboard::ownsMode(QClipboard::Mode mode) const
     return inputDevice->dataDevice()->selectionSource() != 0;
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/client/qwaylandclipboard_p.h b/src/client/qwaylandclipboard_p.h
index 0dea3371a..6c181de1b 100644
--- a/src/client/qwaylandclipboard_p.h
+++ b/src/client/qwaylandclipboard_p.h
@@ -49,6 +49,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandDisplay;
 
 class Q_WAYLAND_CLIENT_EXPORT QWaylandClipboard : public QPlatformClipboard
@@ -67,6 +69,8 @@ private:
     QWaylandDisplay *mDisplay;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDCLIPBOARD_H
diff --git a/src/client/qwaylandcursor.cpp b/src/client/qwaylandcursor.cpp
index 2a1339a79..8dd4bce1a 100644
--- a/src/client/qwaylandcursor.cpp
+++ b/src/client/qwaylandcursor.cpp
@@ -53,6 +53,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandCursor::QWaylandCursor(QWaylandScreen *screen)
     : mDisplay(screen->display())
 {
@@ -305,4 +307,6 @@ void QWaylandCursor::initCursorMap()
     mCursorNamesMap.insert(ResizeSouthWestCursor, "bottom_left_corner");
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/client/qwaylandcursor_p.h b/src/client/qwaylandcursor_p.h
index 282ac685f..d832922d8 100644
--- a/src/client/qwaylandcursor_p.h
+++ b/src/client/qwaylandcursor_p.h
@@ -52,6 +52,8 @@ struct wl_cursor_theme;
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandDisplay;
 class QWaylandScreen;
 
@@ -111,6 +113,8 @@ private:
     QMultiMap<WaylandCursor, QByteArray> mCursorNamesMap;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDCURSOR_H
diff --git a/src/client/qwaylanddatadevice.cpp b/src/client/qwaylanddatadevice.cpp
index edf73a56a..0d6ea7112 100644
--- a/src/client/qwaylanddatadevice.cpp
+++ b/src/client/qwaylanddatadevice.cpp
@@ -57,6 +57,10 @@
 
 #include <QDebug>
 
+QT_BEGIN_NAMESPACE
+
+namespace QtWaylandClient {
+
 QWaylandDataDevice::QWaylandDataDevice(QWaylandDataDeviceManager *manager, QWaylandInputDevice *inputDevice)
     : QtWayland::wl_data_device(manager->get_data_device(inputDevice->wl_seat()))
     , m_display(manager->display())
@@ -249,3 +253,7 @@ void QWaylandDataDevice::dragSourceTargetChanged(const QString &mimeType)
 {
     static_cast<QWaylandDrag *>(QGuiApplicationPrivate::platformIntegration()->drag())->updateTarget(mimeType);
 }
+
+}
+
+QT_END_NAMESPACE
diff --git a/src/client/qwaylanddatadevice_p.h b/src/client/qwaylanddatadevice_p.h
index ef82d84dd..a80312c94 100644
--- a/src/client/qwaylanddatadevice_p.h
+++ b/src/client/qwaylanddatadevice_p.h
@@ -48,12 +48,15 @@
 
 QT_BEGIN_NAMESPACE
 
-class QWaylandDisplay;
 class QMimeData;
+class QWindow;
+
+namespace QtWaylandClient {
+
+class QWaylandDisplay;
 class QWaylandDataDeviceManager;
 class QWaylandDataOffer;
 class QWaylandDataSource;
-class QWindow;
 class QWaylandInputDevice;
 class QWaylandWindow;
 
@@ -99,6 +102,8 @@ private:
     QScopedPointer<QWaylandDataSource> m_dragSource;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDDATADEVICE_H
diff --git a/src/client/qwaylanddatadevicemanager.cpp b/src/client/qwaylanddatadevicemanager.cpp
index ea578ff7b..c86d1ba8a 100644
--- a/src/client/qwaylanddatadevicemanager.cpp
+++ b/src/client/qwaylanddatadevicemanager.cpp
@@ -50,6 +50,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandDataDeviceManager::QWaylandDataDeviceManager(QWaylandDisplay *display, uint32_t id)
     : wl_data_device_manager(display->wl_registry(), id, 1)
     , m_display(display)
@@ -77,5 +79,6 @@ QWaylandDisplay *QWaylandDataDeviceManager::display() const
     return m_display;
 }
 
+}
 
 QT_END_NAMESPACE
diff --git a/src/client/qwaylanddatadevicemanager_p.h b/src/client/qwaylanddatadevicemanager_p.h
index 3ed21d26a..e622f6150 100644
--- a/src/client/qwaylanddatadevicemanager_p.h
+++ b/src/client/qwaylanddatadevicemanager_p.h
@@ -47,6 +47,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandDisplay;
 class QWaylandDataDevice;
 class QWaylandDataSource;
@@ -66,6 +68,8 @@ private:
     QWaylandDisplay *m_display;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDDATADEVICEMANAGER_H
diff --git a/src/client/qwaylanddataoffer.cpp b/src/client/qwaylanddataoffer.cpp
index 4ad73dc7e..10bf2f1e1 100644
--- a/src/client/qwaylanddataoffer.cpp
+++ b/src/client/qwaylanddataoffer.cpp
@@ -51,6 +51,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandDataOffer::QWaylandDataOffer(QWaylandDisplay *display, struct ::wl_data_offer *offer)
     : QtWayland::wl_data_offer(offer)
     , m_mimeData(new QWaylandMimeData(this, display))
@@ -161,4 +163,6 @@ int QWaylandMimeData::readData(int fd, QByteArray &data) const
     return n;
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/client/qwaylanddataoffer_p.h b/src/client/qwaylanddataoffer_p.h
index 12fc0a22f..cdaf8a7ba 100644
--- a/src/client/qwaylanddataoffer_p.h
+++ b/src/client/qwaylanddataoffer_p.h
@@ -49,6 +49,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandDisplay;
 class QWaylandMimeData;
 
@@ -91,6 +93,8 @@ private:
     mutable QHash<QString, QByteArray> m_data;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/client/qwaylanddatasource.cpp b/src/client/qwaylanddatasource.cpp
index 3376db567..cf92a361f 100644
--- a/src/client/qwaylanddatasource.cpp
+++ b/src/client/qwaylanddatasource.cpp
@@ -53,6 +53,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandDataSource::QWaylandDataSource(QWaylandDataDeviceManager *dataDeviceManager, QMimeData *mimeData)
     : QtWayland::wl_data_source(dataDeviceManager->create_data_source())
     , m_mime_data(mimeData)
@@ -93,4 +95,6 @@ void QWaylandDataSource::data_source_target(const QString &mime_type)
     Q_EMIT targetChanged(mime_type);
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/client/qwaylanddatasource_p.h b/src/client/qwaylanddatasource_p.h
index a721336f7..09348f335 100644
--- a/src/client/qwaylanddatasource_p.h
+++ b/src/client/qwaylanddatasource_p.h
@@ -50,6 +50,9 @@
 QT_BEGIN_NAMESPACE
 
 class QMimeData;
+
+namespace QtWaylandClient {
+
 class QWaylandDataDeviceManager;
 class QWaylandDisplay;
 
@@ -76,6 +79,8 @@ private:
     QMimeData *m_mime_data;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDDATASOURCE_H
diff --git a/src/client/qwaylanddecorationfactory.cpp b/src/client/qwaylanddecorationfactory.cpp
index 6f1f74693..4d36f7966 100644
--- a/src/client/qwaylanddecorationfactory.cpp
+++ b/src/client/qwaylanddecorationfactory.cpp
@@ -48,6 +48,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 #ifndef QT_NO_LIBRARY
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
     (QWaylandDecorationFactoryInterface_iid, QLatin1String("/wayland-decoration-client"), Qt::CaseInsensitive))
@@ -94,4 +96,6 @@ QWaylandAbstractDecoration *QWaylandDecorationFactory::create(const QString &nam
     return 0;
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/client/qwaylanddecorationfactory_p.h b/src/client/qwaylanddecorationfactory_p.h
index a7729bcaf..144ae101b 100644
--- a/src/client/qwaylanddecorationfactory_p.h
+++ b/src/client/qwaylanddecorationfactory_p.h
@@ -47,6 +47,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandAbstractDecoration;
 
 class Q_WAYLAND_CLIENT_EXPORT QWaylandDecorationFactory
@@ -56,6 +58,8 @@ public:
     static QWaylandAbstractDecoration *create(const QString &name, const QStringList &args, const QString &pluginPath = QString());
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDDECORATIONFACTORY_H
diff --git a/src/client/qwaylanddecorationplugin.cpp b/src/client/qwaylanddecorationplugin.cpp
index edad5f5f0..3c6463a1f 100644
--- a/src/client/qwaylanddecorationplugin.cpp
+++ b/src/client/qwaylanddecorationplugin.cpp
@@ -43,6 +43,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandDecorationPlugin::QWaylandDecorationPlugin(QObject *parent)
     : QObject(parent)
 {
@@ -51,4 +53,6 @@ QWaylandDecorationPlugin::~QWaylandDecorationPlugin()
 {
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/client/qwaylanddecorationplugin_p.h b/src/client/qwaylanddecorationplugin_p.h
index 6ed8935db..9425bd348 100644
--- a/src/client/qwaylanddecorationplugin_p.h
+++ b/src/client/qwaylanddecorationplugin_p.h
@@ -50,6 +50,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandAbstractDecoration;
 
 #define QWaylandDecorationFactoryInterface_iid "org.qt-project.Qt.WaylandClient.QWaylandDecorationFactoryInterface.5.4"
@@ -64,6 +66,8 @@ public:
     virtual QWaylandAbstractDecoration *create(const QString &key, const QStringList &paramList) = 0;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDDECORATIONPLUGIN_H
diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp
index a4d13db71..ea7fe1a6a 100644
--- a/src/client/qwaylanddisplay.cpp
+++ b/src/client/qwaylanddisplay.cpp
@@ -76,6 +76,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 struct wl_surface *QWaylandDisplay::createSurface(void *handle)
 {
     struct wl_surface *surface = mCompositor.create_surface();
@@ -371,4 +373,6 @@ bool QWaylandDisplay::supportsWindowDecoration() const
     return integrationSupport;
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/client/qwaylanddisplay_p.h b/src/client/qwaylanddisplay_p.h
index 2f12ee7f9..9d4413f6f 100644
--- a/src/client/qwaylanddisplay_p.h
+++ b/src/client/qwaylanddisplay_p.h
@@ -58,10 +58,22 @@ struct wl_cursor_image;
 QT_BEGIN_NAMESPACE
 
 class QAbstractEventDispatcher;
-class QWaylandInputDevice;
 class QSocketNotifier;
-class QWaylandBuffer;
 class QPlatformScreen;
+
+namespace QtWayland {
+    class qt_output_extension;
+    class qt_shell;
+    class qt_sub_surface_extension;
+    class qt_surface_extension;
+    class wl_text_input_manager;
+    class xdg_shell;
+}
+
+namespace QtWaylandClient {
+
+class QWaylandInputDevice;
+class QWaylandBuffer;
 class QWaylandScreen;
 class QWaylandClientBufferIntegration;
 class QWaylandWindowManagerIntegration;
@@ -75,15 +87,6 @@ class QWaylandHardwareIntegration;
 class QWaylandXdgShell;
 class QWaylandShellSurface;
 
-namespace QtWayland {
-    class qt_output_extension;
-    class qt_shell;
-    class qt_sub_surface_extension;
-    class qt_surface_extension;
-    class wl_text_input_manager;
-    class xdg_shell;
-}
-
 typedef void (*RegistryListener)(void *data,
                                  struct wl_registry *registry,
                                  uint32_t id,
@@ -211,6 +214,8 @@ private:
                                      int32_t width, int32_t height);
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDDISPLAY_H
diff --git a/src/client/qwaylanddnd.cpp b/src/client/qwaylanddnd.cpp
index 996e647cc..514383d30 100644
--- a/src/client/qwaylanddnd.cpp
+++ b/src/client/qwaylanddnd.cpp
@@ -53,6 +53,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandDrag::QWaylandDrag(QWaylandDisplay *display)
     : m_display(display)
 {
@@ -134,4 +136,6 @@ void QWaylandDrag::finishDrag(const QPlatformDropQtResponse &response)
     eventFilter(shapedPixmapWindow(), &event);
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/client/qwaylanddnd_p.h b/src/client/qwaylanddnd_p.h
index 1d236fad5..0154f122f 100644
--- a/src/client/qwaylanddnd_p.h
+++ b/src/client/qwaylanddnd_p.h
@@ -52,6 +52,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandDisplay;
 
 class Q_WAYLAND_CLIENT_EXPORT QWaylandDrag : public QBasicDrag
@@ -78,6 +80,8 @@ private:
     QWaylandDisplay *m_display;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDDND_H
diff --git a/src/client/qwaylandeventthread.cpp b/src/client/qwaylandeventthread.cpp
index 22efd6a2a..6cce6c19d 100644
--- a/src/client/qwaylandeventthread.cpp
+++ b/src/client/qwaylandeventthread.cpp
@@ -50,6 +50,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandEventThread::QWaylandEventThread(QObject *parent)
     : QObject(parent)
     , m_display(0)
@@ -117,4 +119,6 @@ wl_display *QWaylandEventThread::display() const
     return m_display;
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/client/qwaylandeventthread_p.h b/src/client/qwaylandeventthread_p.h
index 2df4b05c2..b96c97c2a 100644
--- a/src/client/qwaylandeventthread_p.h
+++ b/src/client/qwaylandeventthread_p.h
@@ -52,6 +52,8 @@ QT_BEGIN_NAMESPACE
 
 class QSocketNotifier;
 
+namespace QtWaylandClient {
+
 class Q_WAYLAND_CLIENT_EXPORT QWaylandEventThread : public QObject
 {
     Q_OBJECT
@@ -85,6 +87,8 @@ private:
 
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDEVENTTHREAD_H
diff --git a/src/client/qwaylandextendedoutput.cpp b/src/client/qwaylandextendedoutput.cpp
index bb6a4779e..26fba99e4 100644
--- a/src/client/qwaylandextendedoutput.cpp
+++ b/src/client/qwaylandextendedoutput.cpp
@@ -49,10 +49,13 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandExtendedOutput::QWaylandExtendedOutput(QWaylandScreen *screen, ::qt_extended_output *extended_output)
     : QtWayland::qt_extended_output(extended_output)
 {
     Q_UNUSED(screen);
 }
 
+}
 QT_END_NAMESPACE
diff --git a/src/client/qwaylandextendedoutput_p.h b/src/client/qwaylandextendedoutput_p.h
index 35ac194a4..0ac24d606 100644
--- a/src/client/qwaylandextendedoutput_p.h
+++ b/src/client/qwaylandextendedoutput_p.h
@@ -47,6 +47,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandDisplay;
 class QWaylandScreen;
 class QWaylandExtendedOutput;
@@ -57,6 +59,8 @@ public:
     QWaylandExtendedOutput(QWaylandScreen *screen, struct ::qt_extended_output *extended_output);
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDEXTENDEDOUTPUT_H
diff --git a/src/client/qwaylandextendedsurface.cpp b/src/client/qwaylandextendedsurface.cpp
index e589698ef..5cb5ec049 100644
--- a/src/client/qwaylandextendedsurface.cpp
+++ b/src/client/qwaylandextendedsurface.cpp
@@ -53,6 +53,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandExtendedSurface::QWaylandExtendedSurface(QWaylandWindow *window)
     : QtWayland::qt_extended_surface(window->display()->windowExtension()->get_extended_surface(window->object()))
     , m_window(window)
@@ -123,4 +125,6 @@ Qt::WindowFlags QWaylandExtendedSurface::setWindowFlags(Qt::WindowFlags flags)
     return flags & (Qt::WindowStaysOnTopHint | Qt::WindowOverridesSystemGestures | Qt::BypassWindowManagerHint);
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/client/qwaylandextendedsurface_p.h b/src/client/qwaylandextendedsurface_p.h
index 1d966292c..fe0ea5938 100644
--- a/src/client/qwaylandextendedsurface_p.h
+++ b/src/client/qwaylandextendedsurface_p.h
@@ -52,6 +52,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandDisplay;
 class QWaylandWindow;
 
@@ -76,6 +78,8 @@ private:
     QVariantMap m_properties;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDEXTENDEDSURFACE_H
diff --git a/src/client/qwaylandinputcontext.cpp b/src/client/qwaylandinputcontext.cpp
index e189b9451..e2b346223 100644
--- a/src/client/qwaylandinputcontext.cpp
+++ b/src/client/qwaylandinputcontext.cpp
@@ -52,6 +52,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 static Qt::Key toQtKey(uint32_t sym)
 {
 #ifndef QT_NO_WAYLAND_XKB
@@ -277,5 +279,7 @@ bool QWaylandInputContext::ensureTextInput()
     return true;
 }
 
+}
+
 QT_END_NAMESPACE
 
diff --git a/src/client/qwaylandinputcontext_p.h b/src/client/qwaylandinputcontext_p.h
index fbb26b9bf..02dd512a2 100644
--- a/src/client/qwaylandinputcontext_p.h
+++ b/src/client/qwaylandinputcontext_p.h
@@ -47,6 +47,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandDisplay;
 
 class QWaylandTextInput : public QtWayland::wl_text_input
@@ -99,6 +101,8 @@ private:
     QScopedPointer<QWaylandTextInput> mTextInput;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDINPUTCONTEXT_H
diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp
index ada2cf2b5..6b6abfe5f 100644
--- a/src/client/qwaylandinputdevice.cpp
+++ b/src/client/qwaylandinputdevice.cpp
@@ -65,6 +65,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandInputDevice::Keyboard::Keyboard(QWaylandInputDevice *p)
     : mParent(p)
     , mFocus(0)
@@ -973,4 +975,6 @@ void QWaylandInputDevice::Touch::touch_frame()
     mTouchPoints.clear();
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/client/qwaylandinputdevice_p.h b/src/client/qwaylandinputdevice_p.h
index a5da8bd0f..238e5964a 100644
--- a/src/client/qwaylandinputdevice_p.h
+++ b/src/client/qwaylandinputdevice_p.h
@@ -66,6 +66,7 @@ struct wl_cursor_image;
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
 
 class QWaylandWindow;
 class QWaylandDisplay;
@@ -284,6 +285,8 @@ public:
     Qt::KeyboardModifiers modifiers;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp
index 27613eef7..60dc1b492 100644
--- a/src/client/qwaylandintegration.cpp
+++ b/src/client/qwaylandintegration.cpp
@@ -82,6 +82,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class GenericWaylandTheme: public QGenericUnixTheme
 {
 public:
@@ -395,4 +397,6 @@ void QWaylandIntegration::initializeInputDeviceIntegration()
     }
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/client/qwaylandintegration_p.h b/src/client/qwaylandintegration_p.h
index c0909418e..745b88a6f 100644
--- a/src/client/qwaylandintegration_p.h
+++ b/src/client/qwaylandintegration_p.h
@@ -47,6 +47,8 @@
 #include <QtWaylandClient/private/qwaylandclientexport_p.h>
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandBuffer;
 class QWaylandDisplay;
 class QWaylandClientBufferIntegration;
@@ -125,6 +127,8 @@ private:
     friend class QWaylandDisplay;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/client/qwaylandnativeinterface.cpp b/src/client/qwaylandnativeinterface.cpp
index b4bb0604d..c4878e540 100644
--- a/src/client/qwaylandnativeinterface.cpp
+++ b/src/client/qwaylandnativeinterface.cpp
@@ -53,6 +53,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandNativeInterface::QWaylandNativeInterface(QWaylandIntegration *integration)
     : m_integration(integration)
 {
@@ -147,4 +149,6 @@ void QWaylandNativeInterface::emitWindowPropertyChanged(QPlatformWindow *window,
     emit windowPropertyChanged(window,name);
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/client/qwaylandnativeinterface_p.h b/src/client/qwaylandnativeinterface_p.h
index 9d0aafdd5..6f6a62b76 100644
--- a/src/client/qwaylandnativeinterface_p.h
+++ b/src/client/qwaylandnativeinterface_p.h
@@ -49,6 +49,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandIntegration;
 class QWaylandScreen;
 
@@ -75,6 +77,8 @@ private:
     QHash<QPlatformWindow*, QVariantMap> m_windowProperties;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDNATIVEINTERFACE_H
diff --git a/src/client/qwaylandqtkey.cpp b/src/client/qwaylandqtkey.cpp
index 16562357f..1eda126cf 100644
--- a/src/client/qwaylandqtkey.cpp
+++ b/src/client/qwaylandqtkey.cpp
@@ -45,6 +45,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandQtKeyExtension::QWaylandQtKeyExtension(QWaylandDisplay *display, uint32_t id)
     : QtWayland::qt_key_extension(display->wl_registry(), id, 2)
     , m_display(display)
@@ -83,4 +85,6 @@ void QWaylandQtKeyExtension::key_extension_qtkey(struct wl_surface *surface,
                                                    autorep, count);
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/client/qwaylandqtkey_p.h b/src/client/qwaylandqtkey_p.h
index d00a90ee0..f705775c4 100644
--- a/src/client/qwaylandqtkey_p.h
+++ b/src/client/qwaylandqtkey_p.h
@@ -49,6 +49,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandDisplay;
 
 class Q_WAYLAND_CLIENT_EXPORT QWaylandQtKeyExtension : public QtWayland::qt_key_extension
@@ -73,6 +75,8 @@ private:
 
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDQTKEY_H
diff --git a/src/client/qwaylandscreen.cpp b/src/client/qwaylandscreen.cpp
index 675c84042..a1aff8d1c 100644
--- a/src/client/qwaylandscreen.cpp
+++ b/src/client/qwaylandscreen.cpp
@@ -53,6 +53,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandScreen::QWaylandScreen(QWaylandDisplay *waylandDisplay, int version, uint32_t id)
     : QPlatformScreen()
     , QtWayland::wl_output(waylandDisplay->wl_registry(), id, qMin(version, 2))
@@ -242,4 +244,6 @@ void QWaylandScreen::output_done()
     QWindowSystemInterface::handleScreenRefreshRateChange(screen(), refreshRate());
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/client/qwaylandscreen_p.h b/src/client/qwaylandscreen_p.h
index d0c5d710f..c337d9be3 100644
--- a/src/client/qwaylandscreen_p.h
+++ b/src/client/qwaylandscreen_p.h
@@ -49,6 +49,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandDisplay;
 class QWaylandCursor;
 class QWaylandExtendedOutput;
@@ -116,6 +118,8 @@ private:
     QWaylandCursor *mWaylandCursor;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDSCREEN_H
diff --git a/src/client/qwaylandshellsurface.cpp b/src/client/qwaylandshellsurface.cpp
index a3855dac0..997d4ac5b 100644
--- a/src/client/qwaylandshellsurface.cpp
+++ b/src/client/qwaylandshellsurface.cpp
@@ -43,6 +43,10 @@
 #include "qwaylandwindow_p.h"
 #include "qwaylandextendedsurface_p.h"
 
+QT_BEGIN_NAMESPACE
+
+namespace QtWaylandClient {
+
 QWaylandShellSurface::QWaylandShellSurface(QWaylandWindow *window)
                     : m_window(window)
 {
@@ -58,3 +62,7 @@ void QWaylandShellSurface::sendProperty(const QString &name, const QVariant &val
     Q_UNUSED(name)
     Q_UNUSED(value)
 }
+
+}
+
+QT_END_NAMESPACE
diff --git a/src/client/qwaylandshellsurface_p.h b/src/client/qwaylandshellsurface_p.h
index 6f2336162..28e55be35 100644
--- a/src/client/qwaylandshellsurface_p.h
+++ b/src/client/qwaylandshellsurface_p.h
@@ -52,9 +52,12 @@
 QT_BEGIN_NAMESPACE
 
 class QVariant;
+class QWindow;
+
+namespace QtWaylandClient {
+
 class QWaylandWindow;
 class QWaylandInputDevice;
-class QWindow;
 
 class Q_WAYLAND_CLIENT_EXPORT QWaylandShellSurface
 {
@@ -94,6 +97,8 @@ private:
     friend class QWaylandWindow;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDSHELLSURFACE_H
diff --git a/src/client/qwaylandshmbackingstore.cpp b/src/client/qwaylandshmbackingstore.cpp
index 9bb36fdc7..64e93d947 100644
--- a/src/client/qwaylandshmbackingstore.cpp
+++ b/src/client/qwaylandshmbackingstore.cpp
@@ -56,6 +56,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandShmBuffer::QWaylandShmBuffer(QWaylandDisplay *display,
                      const QSize &size, QImage::Format format, int scale)
     : mMarginsImage(0)
@@ -372,4 +374,6 @@ const struct wl_callback_listener QWaylandShmBackingStore::frameCallbackListener
     QWaylandShmBackingStore::done
 };
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/client/qwaylandshmbackingstore_p.h b/src/client/qwaylandshmbackingstore_p.h
index 397d6bdbf..a6db31c98 100644
--- a/src/client/qwaylandshmbackingstore_p.h
+++ b/src/client/qwaylandshmbackingstore_p.h
@@ -51,6 +51,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandDisplay;
 class QWaylandAbstractDecoration;
 class QWaylandWindow;
@@ -120,6 +122,8 @@ private:
     struct wl_callback *mFrameCallback;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/client/qwaylandshmwindow.cpp b/src/client/qwaylandshmwindow.cpp
index 431ed2fdb..d2599370a 100644
--- a/src/client/qwaylandshmwindow.cpp
+++ b/src/client/qwaylandshmwindow.cpp
@@ -49,6 +49,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandShmWindow::QWaylandShmWindow(QWindow *window)
     : QWaylandWindow(window)
 {
@@ -63,4 +65,6 @@ QWaylandWindow::WindowType QWaylandShmWindow::windowType() const
     return QWaylandWindow::Shm;
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/client/qwaylandshmwindow_p.h b/src/client/qwaylandshmwindow_p.h
index 47ee74269..1c0c5c15e 100644
--- a/src/client/qwaylandshmwindow_p.h
+++ b/src/client/qwaylandshmwindow_p.h
@@ -47,6 +47,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class Q_WAYLAND_CLIENT_EXPORT QWaylandShmWindow : public QWaylandWindow
 {
 public:
@@ -57,6 +59,8 @@ public:
     QSurfaceFormat format() const { return QSurfaceFormat(); }
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDSHMWINDOW_H
diff --git a/src/client/qwaylandsubsurface.cpp b/src/client/qwaylandsubsurface.cpp
index 6db59fa20..19ba3248d 100644
--- a/src/client/qwaylandsubsurface.cpp
+++ b/src/client/qwaylandsubsurface.cpp
@@ -47,6 +47,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandSubSurface::QWaylandSubSurface(QWaylandWindow *window, struct ::qt_sub_surface *sub_surface)
     : QtWayland::qt_sub_surface(sub_surface)
     , m_window(window)
@@ -88,4 +90,6 @@ void QWaylandSubSurface::adjustPositionOfChildren()
     setPositionToParent(m_window);
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/client/qwaylandsubsurface_p.h b/src/client/qwaylandsubsurface_p.h
index bd0da96d2..93b767352 100644
--- a/src/client/qwaylandsubsurface_p.h
+++ b/src/client/qwaylandsubsurface_p.h
@@ -52,6 +52,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandDisplay;
 class QWaylandWindow;
 class QWaylandSubSurface;
@@ -70,4 +72,6 @@ private:
 
 QT_END_NAMESPACE
 
+}
+
 #endif // QWAYLANDSUBSURFACE_H
diff --git a/src/client/qwaylandtouch.cpp b/src/client/qwaylandtouch.cpp
index 3dabd1ea5..f2b85c225 100644
--- a/src/client/qwaylandtouch.cpp
+++ b/src/client/qwaylandtouch.cpp
@@ -45,6 +45,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandTouchExtension::QWaylandTouchExtension(QWaylandDisplay *display, uint32_t id)
     : QtWayland::qt_touch_extension(display->wl_registry(), id, 1),
       mDisplay(display),
@@ -207,4 +209,6 @@ void QWaylandTouchExtension::touch_extension_configure(uint32_t flags)
     mFlags = flags;
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/client/qwaylandtouch_p.h b/src/client/qwaylandtouch_p.h
index 20827fa8f..bbe159929 100644
--- a/src/client/qwaylandtouch_p.h
+++ b/src/client/qwaylandtouch_p.h
@@ -49,6 +49,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandDisplay;
 class QWaylandInputDevice;
 
@@ -95,6 +97,8 @@ private:
     QWaylandInputDevice *mInputDevice;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDTOUCH_H
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
index 08a123b61..cf4e0e672 100644
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
@@ -67,6 +67,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandWindow *QWaylandWindow::mMouseGrab = 0;
 
 QWaylandWindow::QWaylandWindow(QWindow *window)
@@ -809,4 +811,6 @@ QVariant QWaylandWindow::property(const QString &name, const QVariant &defaultVa
     return m_properties.value(name, defaultValue);
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h
index 2650f46d1..de59e4e20 100644
--- a/src/client/qwaylandwindow_p.h
+++ b/src/client/qwaylandwindow_p.h
@@ -56,6 +56,8 @@ struct wl_egl_window;
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandDisplay;
 class QWaylandBuffer;
 class QWaylandShellSurface;
@@ -253,4 +255,6 @@ inline QPoint QWaylandWindow::attachOffset() const
 
 QT_END_NAMESPACE
 
+}
+
 #endif // QWAYLANDWINDOW_H
diff --git a/src/client/qwaylandwindowmanagerintegration.cpp b/src/client/qwaylandwindowmanagerintegration.cpp
index 174ef93a5..44f93815e 100644
--- a/src/client/qwaylandwindowmanagerintegration.cpp
+++ b/src/client/qwaylandwindowmanagerintegration.cpp
@@ -57,6 +57,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandWindowManagerIntegrationPrivate {
 public:
     QWaylandWindowManagerIntegrationPrivate(QWaylandDisplay *waylandDisplay);
@@ -157,4 +159,6 @@ bool QWaylandWindowManagerIntegration::openDocument(const QUrl &url)
     return true;
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/client/qwaylandwindowmanagerintegration_p.h b/src/client/qwaylandwindowmanagerintegration_p.h
index 0ad2e38df..4ecad94e0 100644
--- a/src/client/qwaylandwindowmanagerintegration_p.h
+++ b/src/client/qwaylandwindowmanagerintegration_p.h
@@ -53,6 +53,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandWindow;
 class QWaylandDisplay;
 
@@ -87,4 +89,6 @@ private:
 
 QT_END_NAMESPACE
 
+}
+
 #endif // QWAYLANDWINDOWMANAGERINTEGRATION_H
diff --git a/src/client/qwaylandwlshellsurface.cpp b/src/client/qwaylandwlshellsurface.cpp
index 86115fa38..550e6caeb 100644
--- a/src/client/qwaylandwlshellsurface.cpp
+++ b/src/client/qwaylandwlshellsurface.cpp
@@ -52,6 +52,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandWlShellSurface::QWaylandWlShellSurface(struct ::wl_shell_surface *shell_surface, QWaylandWindow *window)
     : QtWayland::wl_shell_surface(shell_surface)
     , QWaylandShellSurface(window)
@@ -219,4 +221,6 @@ void QWaylandWlShellSurface::shell_surface_popup_done()
     QCoreApplication::postEvent(m_window->window(), new QCloseEvent());
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/client/qwaylandwlshellsurface_p.h b/src/client/qwaylandwlshellsurface_p.h
index 8d6e298b9..54917b560 100644
--- a/src/client/qwaylandwlshellsurface_p.h
+++ b/src/client/qwaylandwlshellsurface_p.h
@@ -52,9 +52,12 @@
 
 QT_BEGIN_NAMESPACE
 
+class QWindow;
+
+namespace QtWaylandClient {
+
 class QWaylandWindow;
 class QWaylandInputDevice;
-class QWindow;
 class QWaylandExtendedSurface;
 
 class Q_WAYLAND_CLIENT_EXPORT QWaylandWlShellSurface : public QtWayland::wl_shell_surface
@@ -106,4 +109,6 @@ private:
 
 QT_END_NAMESPACE
 
+}
+
 #endif // QWAYLANDSHELLSURFACE_H
diff --git a/src/client/qwaylandxdgshell.cpp b/src/client/qwaylandxdgshell.cpp
index f31d63f42..20a6da5e5 100644
--- a/src/client/qwaylandxdgshell.cpp
+++ b/src/client/qwaylandxdgshell.cpp
@@ -50,6 +50,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandXdgShell::QWaylandXdgShell(struct ::xdg_shell *shell)
     : QtWayland::xdg_shell(shell)
 {
@@ -72,5 +74,6 @@ void QWaylandXdgShell::xdg_shell_ping(uint32_t serial)
     pong(serial);
 }
 
+}
 
 QT_END_NAMESPACE
diff --git a/src/client/qwaylandxdgshell_p.h b/src/client/qwaylandxdgshell_p.h
index 6a396bd11..f2e2e7bb4 100644
--- a/src/client/qwaylandxdgshell_p.h
+++ b/src/client/qwaylandxdgshell_p.h
@@ -52,9 +52,12 @@
 
 QT_BEGIN_NAMESPACE
 
+class QWindow;
+
+namespace QtWaylandClient {
+
 class QWaylandWindow;
 class QWaylandInputDevice;
-class QWindow;
 
 class Q_WAYLAND_CLIENT_EXPORT QWaylandXdgShell : public QtWayland::xdg_shell
 {
@@ -70,4 +73,6 @@ private:
 
 QT_END_NAMESPACE
 
+}
+
 #endif // QWAYLANDXDGSHELL_H
diff --git a/src/client/qwaylandxdgsurface.cpp b/src/client/qwaylandxdgsurface.cpp
index 7f0c7f418..611a01bb6 100644
--- a/src/client/qwaylandxdgsurface.cpp
+++ b/src/client/qwaylandxdgsurface.cpp
@@ -51,6 +51,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandXdgSurface::QWaylandXdgSurface(struct ::xdg_surface *xdg_surface, QWaylandWindow *window)
     : QtWayland::xdg_surface(xdg_surface)
     , QWaylandShellSurface(window)
@@ -240,4 +242,6 @@ void QWaylandXdgSurface::xdg_surface_close()
 {
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/client/qwaylandxdgsurface_p.h b/src/client/qwaylandxdgsurface_p.h
index c5ae9c792..862e177a1 100644
--- a/src/client/qwaylandxdgsurface_p.h
+++ b/src/client/qwaylandxdgsurface_p.h
@@ -53,9 +53,12 @@
 
 QT_BEGIN_NAMESPACE
 
+class QWindow;
+
+namespace QtWaylandClient {
+
 class QWaylandWindow;
 class QWaylandInputDevice;
-class QWindow;
 class QWaylandExtendedSurface;
 
 class Q_WAYLAND_CLIENT_EXPORT QWaylandXdgSurface : public QtWayland::xdg_surface
@@ -114,4 +117,6 @@ private:
 
 QT_END_NAMESPACE
 
+}
+
 #endif // QWAYLANDXDGSURFACE_H
diff --git a/src/client/shellintegration/qwaylandshellintegration_p.h b/src/client/shellintegration/qwaylandshellintegration_p.h
index 45a78199c..31fa98edb 100644
--- a/src/client/shellintegration/qwaylandshellintegration_p.h
+++ b/src/client/shellintegration/qwaylandshellintegration_p.h
@@ -47,6 +47,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandWindow;
 class QWaylandDisplay;
 class QWaylandShellSurface;
@@ -61,6 +63,8 @@ public:
     virtual QWaylandShellSurface *createShellSurface(QWaylandWindow *window) = 0;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDSHELLINTEGRATION_H
diff --git a/src/client/shellintegration/qwaylandshellintegrationfactory.cpp b/src/client/shellintegration/qwaylandshellintegrationfactory.cpp
index f780409e1..4af65d4c0 100644
--- a/src/client/shellintegration/qwaylandshellintegrationfactory.cpp
+++ b/src/client/shellintegration/qwaylandshellintegrationfactory.cpp
@@ -48,6 +48,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 #ifndef QT_NO_LIBRARY
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
     (QWaylandShellIntegrationFactoryInterface_iid, QLatin1String("/wayland-shell-integration"), Qt::CaseInsensitive))
@@ -93,4 +95,6 @@ QWaylandShellIntegration *QWaylandShellIntegrationFactory::create(const QString
     return Q_NULLPTR;
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/client/shellintegration/qwaylandshellintegrationfactory_p.h b/src/client/shellintegration/qwaylandshellintegrationfactory_p.h
index 415067ef8..3b7fa357d 100644
--- a/src/client/shellintegration/qwaylandshellintegrationfactory_p.h
+++ b/src/client/shellintegration/qwaylandshellintegrationfactory_p.h
@@ -47,6 +47,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandShellIntegration;
 
 class Q_WAYLAND_CLIENT_EXPORT QWaylandShellIntegrationFactory
@@ -56,6 +58,8 @@ public:
     static QWaylandShellIntegration *create(const QString &name, const QStringList &args, const QString &pluginPath = QString());
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDSHELLINTEGRATIONFACTORY_H
diff --git a/src/client/shellintegration/qwaylandshellintegrationplugin.cpp b/src/client/shellintegration/qwaylandshellintegrationplugin.cpp
index 05b5e91ad..bbca1558d 100644
--- a/src/client/shellintegration/qwaylandshellintegrationplugin.cpp
+++ b/src/client/shellintegration/qwaylandshellintegrationplugin.cpp
@@ -43,6 +43,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 QWaylandShellIntegrationPlugin::QWaylandShellIntegrationPlugin(QObject *parent)
                               : QObject(parent)
 {
@@ -52,4 +54,6 @@ QWaylandShellIntegrationPlugin::~QWaylandShellIntegrationPlugin()
 {
 }
 
+}
+
 QT_END_NAMESPACE
diff --git a/src/client/shellintegration/qwaylandshellintegrationplugin_p.h b/src/client/shellintegration/qwaylandshellintegrationplugin_p.h
index 7d01fb4e5..07438e7a6 100644
--- a/src/client/shellintegration/qwaylandshellintegrationplugin_p.h
+++ b/src/client/shellintegration/qwaylandshellintegrationplugin_p.h
@@ -50,6 +50,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandShellIntegration;
 
 #define QWaylandShellIntegrationFactoryInterface_iid "org.qt-project.Qt.WaylandClient.QWaylandShellIntegrationFactoryInterface.5.3"
@@ -64,6 +66,8 @@ public:
     virtual QWaylandShellIntegration *create(const QString &key, const QStringList &paramList) = 0;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif // QWAYLANDSHELLINTEGRATIONPLUGIN_H
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
diff --git a/src/plugins/decorations/bradient/main.cpp b/src/plugins/decorations/bradient/main.cpp
index c249248c3..eb4245627 100644
--- a/src/plugins/decorations/bradient/main.cpp
+++ b/src/plugins/decorations/bradient/main.cpp
@@ -54,6 +54,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 #define BUTTON_SPACING 5
 
 #ifndef QT_NO_IMAGEFORMAT_XPM
@@ -446,6 +448,7 @@ QWaylandAbstractDecoration *QWaylandBradientDecorationPlugin::create(const QStri
     return new QWaylandBradientDecoration();
 }
 
+}
 
 QT_END_NAMESPACE
 
diff --git a/src/plugins/hardwareintegration/client/brcm-egl/main.cpp b/src/plugins/hardwareintegration/client/brcm-egl/main.cpp
index c023332eb..eb0d99c4c 100644
--- a/src/plugins/hardwareintegration/client/brcm-egl/main.cpp
+++ b/src/plugins/hardwareintegration/client/brcm-egl/main.cpp
@@ -44,6 +44,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandBrcmEglClientBufferPlugin : public QWaylandClientBufferIntegrationPlugin
 {
     Q_OBJECT
@@ -59,6 +61,8 @@ QWaylandClientBufferIntegration *QWaylandBrcmEglClientBufferPlugin::create(const
     return new QWaylandBrcmEglIntegration();
 }
 
+}
+
 QT_END_NAMESPACE
 
 #include "main.moc"
diff --git a/src/plugins/hardwareintegration/client/drm-egl-server/main.cpp b/src/plugins/hardwareintegration/client/drm-egl-server/main.cpp
index 6a3df4431..3a74a8f8e 100644
--- a/src/plugins/hardwareintegration/client/drm-egl-server/main.cpp
+++ b/src/plugins/hardwareintegration/client/drm-egl-server/main.cpp
@@ -44,6 +44,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class DrmEglServerBufferPlugin : public QWaylandServerBufferIntegrationPlugin
 {
     Q_OBJECT
@@ -59,6 +61,8 @@ QWaylandServerBufferIntegration *DrmEglServerBufferPlugin::create(const QString&
     return new DrmEglServerBufferIntegration();
 }
 
+}
+
 QT_END_NAMESPACE
 
 #include "main.moc"
diff --git a/src/plugins/hardwareintegration/client/libhybris-egl-server/main.cpp b/src/plugins/hardwareintegration/client/libhybris-egl-server/main.cpp
index 9aee15790..18d002e2c 100644
--- a/src/plugins/hardwareintegration/client/libhybris-egl-server/main.cpp
+++ b/src/plugins/hardwareintegration/client/libhybris-egl-server/main.cpp
@@ -44,6 +44,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class LibHybrisEglServerBufferPlugin : public QWaylandServerBufferIntegrationPlugin
 {
     Q_OBJECT
@@ -59,6 +61,8 @@ QWaylandServerBufferIntegration *LibHybrisEglServerBufferPlugin::create(const QS
     return new LibHybrisEglServerBufferIntegration();
 }
 
+}
+
 QT_END_NAMESPACE
 
 #include "main.moc"
diff --git a/src/plugins/hardwareintegration/client/wayland-egl/main.cpp b/src/plugins/hardwareintegration/client/wayland-egl/main.cpp
index e4cd8c1f0..020a41e02 100644
--- a/src/plugins/hardwareintegration/client/wayland-egl/main.cpp
+++ b/src/plugins/hardwareintegration/client/wayland-egl/main.cpp
@@ -44,6 +44,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandEglClientBufferPlugin : public QWaylandClientBufferIntegrationPlugin
 {
     Q_OBJECT
@@ -59,6 +61,8 @@ QWaylandClientBufferIntegration *QWaylandEglClientBufferPlugin::create(const QSt
     return new QWaylandEglClientBufferIntegration();
 }
 
+}
+
 QT_END_NAMESPACE
 
 #include "main.moc"
diff --git a/src/plugins/hardwareintegration/client/xcomposite-egl/main.cpp b/src/plugins/hardwareintegration/client/xcomposite-egl/main.cpp
index 4b9835f1d..eddb5cbdc 100644
--- a/src/plugins/hardwareintegration/client/xcomposite-egl/main.cpp
+++ b/src/plugins/hardwareintegration/client/xcomposite-egl/main.cpp
@@ -44,6 +44,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandXCompositeEglClientBufferIntegrationPlugin : public QWaylandClientBufferIntegrationPlugin
 {
     Q_OBJECT
@@ -59,6 +61,8 @@ QWaylandClientBufferIntegration *QWaylandXCompositeEglClientBufferIntegrationPlu
     return new QWaylandXCompositeEGLClientBufferIntegration();
 }
 
+}
+
 QT_END_NAMESPACE
 
 #include "main.moc"
diff --git a/src/plugins/hardwareintegration/client/xcomposite-glx/main.cpp b/src/plugins/hardwareintegration/client/xcomposite-glx/main.cpp
index 2c6f0fde8..0b3c31334 100644
--- a/src/plugins/hardwareintegration/client/xcomposite-glx/main.cpp
+++ b/src/plugins/hardwareintegration/client/xcomposite-glx/main.cpp
@@ -44,6 +44,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandXCompositeGlxClientBufferIntegrationPlugin : public QWaylandClientBufferIntegrationPlugin
 {
     Q_OBJECT
@@ -59,6 +61,8 @@ QWaylandClientBufferIntegration *QWaylandXCompositeGlxClientBufferIntegrationPlu
     return new QWaylandXCompositeGLXIntegration();
 }
 
+}
+
 QT_END_NAMESPACE
 
 #include "main.moc"
diff --git a/src/plugins/platforms/qwayland-brcm-egl/main.cpp b/src/plugins/platforms/qwayland-brcm-egl/main.cpp
index 73b2d3b64..3c6fdc5fa 100644
--- a/src/plugins/platforms/qwayland-brcm-egl/main.cpp
+++ b/src/plugins/platforms/qwayland-brcm-egl/main.cpp
@@ -44,6 +44,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandIntegrationPlugin : public QPlatformIntegrationPlugin
 {
     Q_OBJECT
@@ -59,6 +61,8 @@ QPlatformIntegration *QWaylandIntegrationPlugin::create(const QString& system, c
     return new QWaylandBrcmEglPlatformIntegration();
 }
 
+}
+
 QT_END_NAMESPACE
 
 #include "main.moc"
diff --git a/src/plugins/platforms/qwayland-brcm-egl/qwaylandbrcmeglplatformintegration.h b/src/plugins/platforms/qwayland-brcm-egl/qwaylandbrcmeglplatformintegration.h
index 8260a2671..3ef9f2e07 100644
--- a/src/plugins/platforms/qwayland-brcm-egl/qwaylandbrcmeglplatformintegration.h
+++ b/src/plugins/platforms/qwayland-brcm-egl/qwaylandbrcmeglplatformintegration.h
@@ -47,6 +47,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandBrcmEglPlatformIntegration : public QWaylandIntegration
 {
 public:
@@ -65,6 +67,8 @@ private:
     QWaylandClientBufferIntegration *m_gl_integration;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/plugins/platforms/qwayland-egl/main.cpp b/src/plugins/platforms/qwayland-egl/main.cpp
index 010a23e25..41de23053 100644
--- a/src/plugins/platforms/qwayland-egl/main.cpp
+++ b/src/plugins/platforms/qwayland-egl/main.cpp
@@ -44,6 +44,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandIntegrationPlugin : public QPlatformIntegrationPlugin
 {
     Q_OBJECT
@@ -59,6 +61,8 @@ QPlatformIntegration *QWaylandIntegrationPlugin::create(const QString& system, c
     return new QWaylandEglPlatformIntegration();
 }
 
+}
+
 QT_END_NAMESPACE
 
 #include "main.moc"
diff --git a/src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h b/src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h
index 5f23f68de..153f3ef9a 100644
--- a/src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h
+++ b/src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h
@@ -48,6 +48,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandEglPlatformIntegration : public QWaylandIntegration
 {
 public:
@@ -65,6 +67,8 @@ private:
     QWaylandEglClientBufferIntegration *m_client_buffer_integration;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/plugins/platforms/qwayland-generic/main.cpp b/src/plugins/platforms/qwayland-generic/main.cpp
index e1761d8e8..1f9cb4a63 100644
--- a/src/plugins/platforms/qwayland-generic/main.cpp
+++ b/src/plugins/platforms/qwayland-generic/main.cpp
@@ -44,6 +44,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandIntegrationPlugin : public QPlatformIntegrationPlugin
 {
     Q_OBJECT
@@ -59,6 +61,8 @@ QPlatformIntegration *QWaylandIntegrationPlugin::create(const QString& system, c
     return new QWaylandIntegration();
 }
 
+}
+
 QT_END_NAMESPACE
 
 #include "main.moc"
diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp b/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp
index d3f5a0b54..e2cc53307 100644
--- a/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp
+++ b/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp
@@ -44,6 +44,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandIntegrationPlugin : public QPlatformIntegrationPlugin
 {
     Q_OBJECT
@@ -59,6 +61,8 @@ QPlatformIntegration *QWaylandIntegrationPlugin::create(const QString& system, c
     return new QWaylandXCompositeEglPlatformIntegration();
 }
 
+}
+
 QT_END_NAMESPACE
 
 #include "main.moc"
diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h b/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h
index 340ab03c3..2c017064b 100644
--- a/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h
+++ b/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h
@@ -48,6 +48,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandXCompositeEglPlatformIntegration : public QWaylandIntegration
 {
 public:
@@ -65,6 +67,8 @@ private:
     QWaylandClientBufferIntegration *m_client_buffer_integration;
 };
 
+}
+
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp b/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp
index fb2b1414e..9c6bc08c4 100644
--- a/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp
+++ b/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp
@@ -46,6 +46,8 @@
 
 QT_BEGIN_NAMESPACE
 
+namespace QtWaylandClient {
+
 class QWaylandIntegrationPlugin : public QPlatformIntegrationPlugin
 {
     Q_OBJECT
@@ -61,6 +63,8 @@ QPlatformIntegration *QWaylandIntegrationPlugin::create(const QString& system, c
     return new QWaylandXCompositeGlxPlatformIntegration();
 }
 
+}
+
 QT_END_NAMESPACE
 
 #include "main.moc"
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
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
parent	1db1fa1619e718eebdc88899df6c0a8c6d2309b9 (diff)