Fixing includes to make it compile again

Change-Id: Id62bf1cb47cd375263a6aaa2e21174d476ab4627
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

diff --git a/src/compositor/wayland_wrapper/wldatasource.cpp b/src/compositor/wayland_wrapper/wldatasource.cpp
index 8c82a61..1f57309 100644 (file)
--- a/src/compositor/wayland_wrapper/wldatasource.cpp
+++ b/src/compositor/wayland_wrapper/wldatasource.cpp
@@ -42,7 +42,9 @@
 #include "wldataoffer.h"
 #include "wldatadevicemanager.h"
 #include "wlcompositor.h"
-#include <wayland-server.h>
+
+#include <wayland-server-protocol.h>
+
 #include <QtCore/QDebug>
 
 namespace Wayland {

diff --git a/src/compositor/wayland_wrapper/wldatasource.h b/src/compositor/wayland_wrapper/wldatasource.h
index a4a9dd0..44a965c 100644 (file)
--- a/src/compositor/wayland_wrapper/wldatasource.h
+++ b/src/compositor/wayland_wrapper/wldatasource.h
@@ -41,7 +41,7 @@
 #ifndef WLDATASOURCE_H
 #define WLDATASOURCE_H
 
-#include <wayland-server-protocol.h>
+#include <wayland-server.h>
 
 #include <QtCore/QByteArray>
 #include <QtCore/QList>

diff --git a/src/compositor/wayland_wrapper/wlextendedoutput.h b/src/compositor/wayland_wrapper/wlextendedoutput.h
index b8f41c0..c300d9b 100644 (file)
--- a/src/compositor/wayland_wrapper/wlextendedoutput.h
+++ b/src/compositor/wayland_wrapper/wlextendedoutput.h
@@ -41,6 +41,7 @@
 #ifndef WLEXTENDEDOUTPUT_H
 #define WLEXTENDEDOUTPUT_H
 
+#include "wayland-server.h"
 #include "wayland-output-extension-server-protocol.h"
 
 #include <QtCore/qnamespace.h>

diff --git a/src/compositor/wayland_wrapper/wlextendedsurface.h b/src/compositor/wayland_wrapper/wlextendedsurface.h
index 6edf64a..0dfaaa3 100644 (file)
--- a/src/compositor/wayland_wrapper/wlextendedsurface.h
+++ b/src/compositor/wayland_wrapper/wlextendedsurface.h
@@ -41,6 +41,7 @@
 #ifndef WLEXTENDEDSURFACE_H
 #define WLEXTENDEDSURFACE_H
 
+#include <wayland-server.h>
 #include "wayland-surface-extension-server-protocol.h"
 
 #include "wlsurface.h"