diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2017-01-30 15:34:38 +0100 |
|---|---|---|
| committer | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2017-01-31 09:12:19 +0000 |
| commit | 4060e1416d0340b6c31ee193db6be3ce8083a4cd (patch) | |
| tree | cdea05902158ead180c463950e1aa1eeff64b4e7 | |
| parent | e26696524ceb58f4fe0cb7202d873240b6a9478d (diff) | |
Fix namespaced builds
Change-Id: I07e6aab0f2379c4bbcde8b8d1d2dc1b581f9987a
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@hawaiios.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| -rw-r--r-- | src/compositor/extensions/qwaylandiviapplication.h | 4 | ||||
| -rw-r--r-- | src/compositor/extensions/qwaylandivisurface.h | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/compositor/extensions/qwaylandiviapplication.h b/src/compositor/extensions/qwaylandiviapplication.h index a3e057a86..57a140bf7 100644 --- a/src/compositor/extensions/qwaylandiviapplication.h +++ b/src/compositor/extensions/qwaylandiviapplication.h @@ -40,13 +40,13 @@ #include <QtWaylandCompositor/QWaylandCompositorExtension> #include <QtCore/QSize> +QT_BEGIN_NAMESPACE + class QWaylandIviSurface; class QWaylandSurface; class QWaylandResource; class QWaylandIviApplicationPrivate; -QT_BEGIN_NAMESPACE - class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandIviApplication : public QWaylandCompositorExtensionTemplate<QWaylandIviApplication> { Q_OBJECT diff --git a/src/compositor/extensions/qwaylandivisurface.h b/src/compositor/extensions/qwaylandivisurface.h index ec5365077..4e11493fc 100644 --- a/src/compositor/extensions/qwaylandivisurface.h +++ b/src/compositor/extensions/qwaylandivisurface.h @@ -39,14 +39,15 @@ #include <QtWaylandCompositor/QWaylandShellSurface> +class wl_resource; + +QT_BEGIN_NAMESPACE + class QWaylandIviSurfacePrivate; class QWaylandSurface; class QWaylandIviApplication; class QWaylandSurfaceRole; class QWaylandResource; -class wl_resource; - -QT_BEGIN_NAMESPACE class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandIviSurface : public QWaylandShellSurfaceTemplate<QWaylandIviSurface> { |