diff options
| author | Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> | 2016-10-01 09:08:01 +0200 |
|---|---|---|
| committer | Pier Luigi Fiorini <pierluigi.fiorini@hawaiios.org> | 2016-10-01 09:33:33 +0000 |
| commit | b585ff36ffeb62eec8513a51b01fa53b1e489725 (patch) | |
| tree | 875f3a72069267f70f557b46527972fd18c25d1c /src/compositor | |
| parent | 24c0acd239b81e31e3876e5d3b409105d3a8281b (diff) | |
Include headers with full path
Fix build of programs using the private API outside QtWayland.
Change-Id: Ib43ed1be8df8be3cc7b67588003cd7f0a6ff6eb1
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Diffstat (limited to 'src/compositor')
5 files changed, 8 insertions, 7 deletions
diff --git a/src/compositor/compositor_api/qwaylanddestroylistener_p.h b/src/compositor/compositor_api/qwaylanddestroylistener_p.h index 63b2d3ce9..03ba73a7f 100644 --- a/src/compositor/compositor_api/qwaylanddestroylistener_p.h +++ b/src/compositor/compositor_api/qwaylanddestroylistener_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include "qwaylanddestroylistener.h" +#include <QtWaylandCompositor/QWaylandDestroyListener> #include <QtCore/private/qobject_p.h> diff --git a/src/compositor/compositor_api/qwaylandquickitem_p.h b/src/compositor/compositor_api/qwaylandquickitem_p.h index 8c242ac88..30f1e93c7 100644 --- a/src/compositor/compositor_api/qwaylandquickitem_p.h +++ b/src/compositor/compositor_api/qwaylandquickitem_p.h @@ -52,8 +52,7 @@ #include <QtQuick/QSGMaterialShader> #include <QtQuick/QSGMaterial> -#include "qwaylandquickitem.h" - +#include <QtWaylandCompositor/QWaylandQuickItem> #include <QtWaylandCompositor/QWaylandOutput> QT_BEGIN_NAMESPACE diff --git a/src/compositor/extensions/qwlqtkey_p.h b/src/compositor/extensions/qwlqtkey_p.h index 1b9c7391e..a4e67acfe 100644 --- a/src/compositor/extensions/qwlqtkey_p.h +++ b/src/compositor/extensions/qwlqtkey_p.h @@ -48,12 +48,12 @@ // We mean it. // -#include "wayland-util.h" - #include <QtWaylandCompositor/QWaylandCompositorExtensionTemplate> #include <QtWaylandCompositor/QWaylandCompositor> #include <QtWaylandCompositor/private/qwayland-server-qtkey-extension.h> +#include <wayland-util.h> + QT_BEGIN_NAMESPACE class QWaylandSurface; diff --git a/src/compositor/extensions/qwlqttouch_p.h b/src/compositor/extensions/qwlqttouch_p.h index 32d7658f0..0b3f3acca 100644 --- a/src/compositor/extensions/qwlqttouch_p.h +++ b/src/compositor/extensions/qwlqttouch_p.h @@ -51,7 +51,8 @@ #include <QtWaylandCompositor/private/qwayland-server-touch-extension.h> #include <QtWaylandCompositor/QWaylandCompositor> #include <QtWaylandCompositor/QWaylandCompositorExtensionTemplate> -#include "wayland-util.h" + +#include <wayland-util.h> QT_BEGIN_NAMESPACE diff --git a/src/compositor/global/qwaylandcompositorextension_p.h b/src/compositor/global/qwaylandcompositorextension_p.h index a9a670d66..d94896a57 100644 --- a/src/compositor/global/qwaylandcompositorextension_p.h +++ b/src/compositor/global/qwaylandcompositorextension_p.h @@ -48,9 +48,10 @@ // We mean it. // -#include "qwaylandcompositorextension.h" #include <QtCore/private/qobject_p.h> +#include <QtWaylandCompositor/QWaylandCompositorExtension> + QT_BEGIN_NAMESPACE class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandCompositorExtensionPrivate : public QObjectPrivate |