summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorgen Lind <jorgen.lind@digia.com>2014-01-09 12:24:24 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-09 14:18:50 +0100
commitc9734e76ce03ebba63e34b60b16a9cca3efa3569 (patch)
treed71e8b3e57b88602ee42e883a29c40b1b0a20dc1
parent3323630585ea40842db42ad64ad45fe5b465a5b8 (diff)
downloadqtwayland-c9734e76ce03ebba63e34b60b16a9cca3efa3569.tar.gz
Include wayland-client with < and not "
Change-Id: Ida61437bb76c81ee2af57856d9be9694e2fdb4a4 Reviewed-by: Andrew Knight <andrew.knight@digia.com>
-rw-r--r--src/client/qwaylandextendedsurface.cpp2
-rw-r--r--src/client/qwaylandwindowmanagerintegration_p.h2
-rw-r--r--src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp2
-rw-r--r--src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h2
-rw-r--r--src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h2
-rw-r--r--src/hardwareintegration/client/xcomposite_share/qwaylandxcompositebuffer.cpp2
-rw-r--r--tests/auto/compositor/mockclient.h2
7 files changed, 6 insertions, 8 deletions
diff --git a/src/client/qwaylandextendedsurface.cpp b/src/client/qwaylandextendedsurface.cpp
index 9d5a4970..fe280416 100644
--- a/src/client/qwaylandextendedsurface.cpp
+++ b/src/client/qwaylandextendedsurface.cpp
@@ -43,8 +43,6 @@
#include "qwaylandwindow_p.h"
-#include "wayland-client.h"
-
#include "qwaylanddisplay_p.h"
#include "qwaylandnativeinterface_p.h"
diff --git a/src/client/qwaylandwindowmanagerintegration_p.h b/src/client/qwaylandwindowmanagerintegration_p.h
index 8c8f3c32..844b122a 100644
--- a/src/client/qwaylandwindowmanagerintegration_p.h
+++ b/src/client/qwaylandwindowmanagerintegration_p.h
@@ -45,7 +45,7 @@
#include <QtCore/QObject>
#include <QtCore/QScopedPointer>
-#include "wayland-client.h"
+#include <wayland-client.h>
#include <QtWaylandClient/private/qwaylanddisplay_p.h>
#include <qpa/qplatformservices.h>
diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp
index c7073e14..5c67ba8e 100644
--- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp
+++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp
@@ -53,8 +53,8 @@
#define EGL_EGLEXT_PROTOTYPES
#include <EGL/eglext_brcm.h>
+#include <wayland-client.h>
#include "wayland-brcm-client-protocol.h"
-#include "wayland-client.h"
QT_BEGIN_NAMESPACE
diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h
index 068a35df..9cf19e1c 100644
--- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h
+++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h
@@ -43,7 +43,7 @@
#define QWAYLANDXCOMPOSITEEGLCLIENTBUFFERINTEGRATION_H
#include <QtWaylandClient/private/qwaylandclientbufferintegration_p.h>
-#include "wayland-client.h"
+#include <wayland-client.h>
#include <QtCore/QTextStream>
#include <QtCore/QDataStream>
diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h
index f47f03eb..ab7cd014 100644
--- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h
+++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h
@@ -43,7 +43,7 @@
#define QWAYLANDXCOMPOSITEGLXINTEGRATION_H
#include <QtWaylandClient/qwaylandglintegration.h>
-#include "wayland-client.h"
+#include <wayland-client.h>
#include <QtCore/QTextStream>
#include <QtCore/QDataStream>
diff --git a/src/hardwareintegration/client/xcomposite_share/qwaylandxcompositebuffer.cpp b/src/hardwareintegration/client/xcomposite_share/qwaylandxcompositebuffer.cpp
index c65ad4a1..94a9772a 100644
--- a/src/hardwareintegration/client/xcomposite_share/qwaylandxcompositebuffer.cpp
+++ b/src/hardwareintegration/client/xcomposite_share/qwaylandxcompositebuffer.cpp
@@ -41,7 +41,7 @@
#include "qwaylandxcompositebuffer.h"
-#include "wayland-client.h"
+#include <wayland-client.h>
#include "wayland-xcomposite-client-protocol.h"
QT_BEGIN_NAMESPACE
diff --git a/tests/auto/compositor/mockclient.h b/tests/auto/compositor/mockclient.h
index fa7c28a8..db748df4 100644
--- a/tests/auto/compositor/mockclient.h
+++ b/tests/auto/compositor/mockclient.h
@@ -39,7 +39,7 @@
**
****************************************************************************/
-#include "wayland-client.h"
+#include <wayland-client.h>
#include <QObject>
#include <QImage>