From 6e2bbb58fd779d3e969c0adb1cc98f64c8c7b2ee Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete@nokia.com>
Date: Fri, 29 Apr 2011 13:04:43 +0200
Subject: [PATCH] include file fix for wayland

---
 .../xcomposite_share/qwaylandxcompositebuffer.cpp             | 1 +
 .../xcomposite_share/qwaylandxcompositebuffer.h               | 4 +++-
 src/plugins/platforms/wayland/qwaylandbuffer.h                | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/plugins/platforms/wayland/gl_integration/xcomposite_share/qwaylandxcompositebuffer.cpp b/src/plugins/platforms/wayland/gl_integration/xcomposite_share/qwaylandxcompositebuffer.cpp
index 4b0d3a073fa..81c18058dd4 100644
--- a/src/plugins/platforms/wayland/gl_integration/xcomposite_share/qwaylandxcompositebuffer.cpp
+++ b/src/plugins/platforms/wayland/gl_integration/xcomposite_share/qwaylandxcompositebuffer.cpp
@@ -42,6 +42,7 @@
 #include "qwaylandxcompositebuffer.h"
 
 #include "wayland-client.h"
+#include "wayland-xcomposite-client-protocol.h"
 
 QWaylandXCompositeBuffer::QWaylandXCompositeBuffer(wl_xcomposite *xcomposite, uint32_t window, const QSize &size, wl_visual *visual)
     :mSize(size)
diff --git a/src/plugins/platforms/wayland/gl_integration/xcomposite_share/qwaylandxcompositebuffer.h b/src/plugins/platforms/wayland/gl_integration/xcomposite_share/qwaylandxcompositebuffer.h
index b346651957e..c51f6bbf4cf 100644
--- a/src/plugins/platforms/wayland/gl_integration/xcomposite_share/qwaylandxcompositebuffer.h
+++ b/src/plugins/platforms/wayland/gl_integration/xcomposite_share/qwaylandxcompositebuffer.h
@@ -43,8 +43,10 @@
 #define QWAYLANDXCOMPOSITEBUFFER_H
 
 #include "qwaylandbuffer.h"
+#include <stdint.h>
 
-#include "wayland-xcomposite-client-protocol.h"
+struct wl_xcomposite;
+struct wl_visual;
 
 class QWaylandXCompositeBuffer : public QWaylandBuffer
 {
diff --git a/src/plugins/platforms/wayland/qwaylandbuffer.h b/src/plugins/platforms/wayland/qwaylandbuffer.h
index 8779d5fda0d..e97a07b2115 100644
--- a/src/plugins/platforms/wayland/qwaylandbuffer.h
+++ b/src/plugins/platforms/wayland/qwaylandbuffer.h
@@ -44,7 +44,7 @@
 
 #include <QtCore/QSize>
 
-#include <wayland-client-protocol.h>
+struct wl_buffer;
 
 class QWaylandBuffer {
 public: