From b585ff36ffeb62eec8513a51b01fa53b1e489725 Mon Sep 17 00:00:00 2001
From: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
Date: Sat, 1 Oct 2016 09:08:01 +0200
Subject: 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>
---
 src/client/global/qwaylandclientextension_p.h             | 2 +-
 src/client/qwaylandwlshellsurface_p.h                     | 4 ++--
 src/client/qwaylandxdgpopup_p.h                           | 4 ++--
 src/client/qwaylandxdgshell_p.h                           | 2 +-
 src/client/qwaylandxdgsurface_p.h                         | 4 ++--
 src/compositor/compositor_api/qwaylanddestroylistener_p.h | 2 +-
 src/compositor/compositor_api/qwaylandquickitem_p.h       | 3 +--
 src/compositor/extensions/qwlqtkey_p.h                    | 4 ++--
 src/compositor/extensions/qwlqttouch_p.h                  | 3 ++-
 src/compositor/global/qwaylandcompositorextension_p.h     | 3 ++-
 10 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/client/global/qwaylandclientextension_p.h b/src/client/global/qwaylandclientextension_p.h
index 88cc7a887..7c88161fa 100644
--- a/src/client/global/qwaylandclientextension_p.h
+++ b/src/client/global/qwaylandclientextension_p.h
@@ -48,8 +48,8 @@
 // We mean it.
 //
 
-#include "qwaylandclientextension.h"
 #include <QtCore/private/qobject_p.h>
+#include <QtWaylandClient/QWaylandClientExtension>
 #include <QtWaylandClient/private/qwaylandintegration_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/client/qwaylandwlshellsurface_p.h b/src/client/qwaylandwlshellsurface_p.h
index c319cd983..ef732ef85 100644
--- a/src/client/qwaylandwlshellsurface_p.h
+++ b/src/client/qwaylandwlshellsurface_p.h
@@ -55,9 +55,9 @@
 
 #include <wayland-client.h>
 
-#include <QtWaylandClient/private/qwayland-wayland.h>
 #include <QtWaylandClient/qwaylandclientexport.h>
-#include "qwaylandshellsurface_p.h"
+#include <QtWaylandClient/private/qwayland-wayland.h>
+#include <QtWaylandClient/private/qwaylandshellsurface_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/client/qwaylandxdgpopup_p.h b/src/client/qwaylandxdgpopup_p.h
index 1f211012d..ff5804113 100644
--- a/src/client/qwaylandxdgpopup_p.h
+++ b/src/client/qwaylandxdgpopup_p.h
@@ -47,9 +47,9 @@
 
 #include <wayland-client.h>
 
-#include <QtWaylandClient/private/qwayland-xdg-shell.h>
 #include <QtWaylandClient/qwaylandclientexport.h>
-#include "qwaylandshellsurface_p.h"
+#include <QtWaylandClient/private/qwayland-xdg-shell.h>
+#include <QtWaylandClient/private/qwaylandshellsurface_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/client/qwaylandxdgshell_p.h b/src/client/qwaylandxdgshell_p.h
index 77b05b462..c04a9ce66 100644
--- a/src/client/qwaylandxdgshell_p.h
+++ b/src/client/qwaylandxdgshell_p.h
@@ -57,7 +57,7 @@
 
 #include <QtWaylandClient/private/qwayland-xdg-shell.h>
 #include <QtWaylandClient/qwaylandclientexport.h>
-#include "qwaylandshellsurface_p.h"
+#include <QtWaylandClient/private/qwaylandshellsurface_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/client/qwaylandxdgsurface_p.h b/src/client/qwaylandxdgsurface_p.h
index 1ce029af8..27decabb4 100644
--- a/src/client/qwaylandxdgsurface_p.h
+++ b/src/client/qwaylandxdgsurface_p.h
@@ -56,9 +56,9 @@
 
 #include <wayland-client.h>
 
-#include <QtWaylandClient/private/qwayland-xdg-shell.h>
 #include <QtWaylandClient/qwaylandclientexport.h>
-#include "qwaylandshellsurface_p.h"
+#include <QtWaylandClient/private/qwayland-xdg-shell.h>
+#include <QtWaylandClient/private/qwaylandshellsurface_p.h>
 
 QT_BEGIN_NAMESPACE
 
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
-- 
cgit v1.2.3