diff options
| author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-11-27 12:13:00 +0100 |
|---|---|---|
| committer | Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> | 2015-11-28 10:11:47 +0000 |
| commit | 77503ab20b4408fdf32b94400bc54f7ea5f628dc (patch) | |
| tree | dcb1ff353d9df358e436222f32dc2e8076433a32 /src | |
| parent | 40217a5a3fb20a625ae4ec43cda84f89a435482d (diff) | |
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>
Diffstat (limited to 'src')
5 files changed, 18 insertions, 4 deletions
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 |