summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/plugins/platforms/wayland/qwaylandsubsurface.h1
-rw-r--r--tests/auto/compositor/mockclient.h1
-rw-r--r--wayland_sha1.txt2
3 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/platforms/wayland/qwaylandsubsurface.h b/src/plugins/platforms/wayland/qwaylandsubsurface.h
index 4d3ff19df..3de953f82 100644
--- a/src/plugins/platforms/wayland/qwaylandsubsurface.h
+++ b/src/plugins/platforms/wayland/qwaylandsubsurface.h
@@ -46,7 +46,6 @@ class QWaylandDisplay;
class QWaylandWindow;
class QWaylandSubSurface;
-#include <string.h>
#include <wayland-client.h>
class QWaylandSubSurfaceExtension
diff --git a/tests/auto/compositor/mockclient.h b/tests/auto/compositor/mockclient.h
index e6be12fe7..456f7c3dd 100644
--- a/tests/auto/compositor/mockclient.h
+++ b/tests/auto/compositor/mockclient.h
@@ -39,7 +39,6 @@
**
****************************************************************************/
-#include "string.h"
#include "wayland-client.h"
#include <QObject>
diff --git a/wayland_sha1.txt b/wayland_sha1.txt
index 099b2fb3d..5a39d5136 100644
--- a/wayland_sha1.txt
+++ b/wayland_sha1.txt
@@ -1,3 +1,3 @@
This version of Qt-Compositor is checked against the following sha1 from the
Wayland repository:
-aa777e5b10e17d12c4bb6440f7c659d2a12191f5
+a13aab4e15f7defe8207dfc18277321166577d7a