From b80fe76ae25411ac7309f3f236f572a64fd0b1f4 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: [PATCH] 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>
---
 .../platforms/wayland/global/qwaylandclientextension_p.h      | 2 +-
 src/plugins/platforms/wayland/qwaylandwlshellsurface_p.h      | 4 ++--
 src/plugins/platforms/wayland/qwaylandxdgpopup_p.h            | 4 ++--
 src/plugins/platforms/wayland/qwaylandxdgshell_p.h            | 2 +-
 src/plugins/platforms/wayland/qwaylandxdgsurface_p.h          | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/plugins/platforms/wayland/global/qwaylandclientextension_p.h b/src/plugins/platforms/wayland/global/qwaylandclientextension_p.h
index 88cc7a88718..7c88161fa51 100644
--- a/src/plugins/platforms/wayland/global/qwaylandclientextension_p.h
+++ b/src/plugins/platforms/wayland/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/plugins/platforms/wayland/qwaylandwlshellsurface_p.h b/src/plugins/platforms/wayland/qwaylandwlshellsurface_p.h
index c319cd98393..ef732ef85df 100644
--- a/src/plugins/platforms/wayland/qwaylandwlshellsurface_p.h
+++ b/src/plugins/platforms/wayland/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/plugins/platforms/wayland/qwaylandxdgpopup_p.h b/src/plugins/platforms/wayland/qwaylandxdgpopup_p.h
index 1f211012d34..ff58041134d 100644
--- a/src/plugins/platforms/wayland/qwaylandxdgpopup_p.h
+++ b/src/plugins/platforms/wayland/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/plugins/platforms/wayland/qwaylandxdgshell_p.h b/src/plugins/platforms/wayland/qwaylandxdgshell_p.h
index 77b05b46224..c04a9ce6673 100644
--- a/src/plugins/platforms/wayland/qwaylandxdgshell_p.h
+++ b/src/plugins/platforms/wayland/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/plugins/platforms/wayland/qwaylandxdgsurface_p.h b/src/plugins/platforms/wayland/qwaylandxdgsurface_p.h
index 1ce029af88c..27decabb4e6 100644
--- a/src/plugins/platforms/wayland/qwaylandxdgsurface_p.h
+++ b/src/plugins/platforms/wayland/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