From 7d94b055bf230510f7b8dde724a53d3fd96dfba8 Mon Sep 17 00:00:00 2001
From: Andrew Knight <andrew.knight@digia.com>
Date: Mon, 17 Jun 2013 10:58:12 +0300
Subject: [PATCH] Wayland compositor: only include Qt's generated protocol
 headers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The system may come with conflicting headers generated by wayland-scanner.

Change-Id: I1aef7e32683ab02d0712ee65970f010a86854e43
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
---
 src/tools/qtwaylandscanner/qtwaylandscanner.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/tools/qtwaylandscanner/qtwaylandscanner.cpp b/src/tools/qtwaylandscanner/qtwaylandscanner.cpp
index 6f1516f4bfa..c51916343d3 100644
--- a/src/tools/qtwaylandscanner/qtwaylandscanner.cpp
+++ b/src/tools/qtwaylandscanner/qtwaylandscanner.cpp
@@ -364,7 +364,6 @@ void process(QXmlStreamReader &xml)
         printf("#define %s\n", inclusionGuard.constData());
         printf("\n");
         printf("#include \"wayland-server.h\"\n");
-        printf("#include \"wayland-server-protocol.h\"\n");
         printf("#include \"wayland-%s-server-protocol.h\"\n", QByteArray(protocolName).replace('_', '-').constData());
         printf("#include <QByteArray>\n");
         printf("#include <QString>\n");