From 77503ab20b4408fdf32b94400bc54f7ea5f628dc Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete@theqtcompany.com>
Date: Fri, 27 Nov 2015 12:13:00 +0100
Subject: Compile fix for namespaced Qt builds

Change-Id: Ie23f7c01331d5e52dcf30952d7ad9ade6ef5a5e0
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
---
 examples/wayland/custom-extension/client/customextension.cpp | 4 ++++
 src/compositor/compositor_api/qwaylanddestroylistener.h      | 2 ++
 src/compositor/compositor_api/qwaylandoutput.h               | 8 ++++----
 src/compositor/extensions/qwaylandwindowmanagerextension_p.h | 5 +++++
 src/compositor/global/qwaylandextension_p.h                  | 4 ++++
 src/imports/compositor/qwaylandmousetracker.cpp              | 3 +++
 6 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/examples/wayland/custom-extension/client/customextension.cpp b/examples/wayland/custom-extension/client/customextension.cpp
index e6bab56c6..81694fdab 100644
--- a/examples/wayland/custom-extension/client/customextension.cpp
+++ b/examples/wayland/custom-extension/client/customextension.cpp
@@ -44,6 +44,8 @@
 
 #include <QDebug>
 
+QT_BEGIN_NAMESPACE
+
 namespace QtWaylandClient {
 
 CustomExtension::CustomExtension(QWaylandIntegration *wayland_integration)
@@ -79,3 +81,5 @@ void CustomExtension::registry_global(uint32_t id, const QString &interface, uin
 }
 
 }
+
+QT_END_NAMESPACE
diff --git a/src/compositor/compositor_api/qwaylanddestroylistener.h b/src/compositor/compositor_api/qwaylanddestroylistener.h
index b16108c88..04e0546af 100644
--- a/src/compositor/compositor_api/qwaylanddestroylistener.h
+++ b/src/compositor/compositor_api/qwaylanddestroylistener.h
@@ -41,6 +41,8 @@
 #include <QtCore/QObject>
 #include <QtWaylandCompositor/qwaylandexport.h>
 
+struct wl_resource;
+
 QT_BEGIN_NAMESPACE
 
 class QWaylandDestroyListenerPrivate;
diff --git a/src/compositor/compositor_api/qwaylandoutput.h b/src/compositor/compositor_api/qwaylandoutput.h
index 957597f49..31e5fa566 100644
--- a/src/compositor/compositor_api/qwaylandoutput.h
+++ b/src/compositor/compositor_api/qwaylandoutput.h
@@ -45,10 +45,10 @@
 #include <QRect>
 #include <QSize>
 
-QT_BEGIN_NAMESPACE
-
 struct wl_resource;
 
+QT_BEGIN_NAMESPACE
+
 class QWaylandOutputPrivate;
 class QWaylandCompositor;
 class QWindow;
@@ -190,8 +190,8 @@ protected:
     virtual void initialize();
 };
 
-Q_DECLARE_METATYPE(QWaylandOutput::Mode)
-
 QT_END_NAMESPACE
 
+Q_DECLARE_METATYPE(QWaylandOutput::Mode)
+
 #endif // QWAYLANDOUTPUT_H
diff --git a/src/compositor/extensions/qwaylandwindowmanagerextension_p.h b/src/compositor/extensions/qwaylandwindowmanagerextension_p.h
index 6fbc89f7f..bbce28623 100644
--- a/src/compositor/extensions/qwaylandwindowmanagerextension_p.h
+++ b/src/compositor/extensions/qwaylandwindowmanagerextension_p.h
@@ -54,6 +54,8 @@
 
 #include <QMap>
 
+QT_BEGIN_NAMESPACE
+
 class Q_COMPOSITOR_EXPORT QWaylandWindowManagerExtensionPrivate : public QWaylandExtensionTemplatePrivate, public QtWaylandServer::qt_windowmanager
 {
     Q_DECLARE_PUBLIC(QWaylandWindowManagerExtension)
@@ -69,4 +71,7 @@ private:
     QWaylandCompositor *m_compositor;
     QMap<Resource*, QString> m_urls;
 };
+
+QT_END_NAMESPACE
+
 #endif  /*QWAYLANDWINDOWMANAGEREXTENSION_P_H*/
diff --git a/src/compositor/global/qwaylandextension_p.h b/src/compositor/global/qwaylandextension_p.h
index 03a7649c0..f25b34bba 100644
--- a/src/compositor/global/qwaylandextension_p.h
+++ b/src/compositor/global/qwaylandextension_p.h
@@ -51,6 +51,8 @@
 #include "qwaylandextension.h"
 #include <QtCore/private/qobject_p.h>
 
+QT_BEGIN_NAMESPACE
+
 class Q_COMPOSITOR_EXPORT QWaylandExtensionPrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QWaylandExtension)
@@ -77,4 +79,6 @@ public:
     { }
 };
 
+QT_END_NAMESPACE
+
 #endif  /*QWAYLANDEXTENSION_P_H*/
diff --git a/src/imports/compositor/qwaylandmousetracker.cpp b/src/imports/compositor/qwaylandmousetracker.cpp
index 15db46f12..fd6a591ee 100644
--- a/src/imports/compositor/qwaylandmousetracker.cpp
+++ b/src/imports/compositor/qwaylandmousetracker.cpp
@@ -38,6 +38,8 @@
 
 #include <QtQuick/private/qquickitem_p.h>
 
+QT_BEGIN_NAMESPACE
+
 class QWaylandMouseTrackerPrivate : public QQuickItemPrivate
 {
     Q_DECLARE_PUBLIC(QWaylandMouseTracker)
@@ -135,3 +137,4 @@ void QWaylandMouseTracker::hoverMoveEvent(QHoverEvent *event)
     d->handleMousePos(event->posF());
 }
 
+QT_END_NAMESPACE
-- 
cgit v1.2.3