diff options
| author | Andrew Knight <andrew.knight@digia.com> | 2013-06-17 10:58:12 +0300 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@digia.com> | 2013-06-28 16:07:11 +0200 |
| commit | 388e38afb5375b9e55005169a7218ff45870ebd9 (patch) | |
| tree | 3c0414c7eef969dbaa6574c9aa531df9ca62e03f /src/qtwaylandscanner | |
| parent | 9f502d05838de2ef04174df7d9735100e6873d67 (diff) | |
Wayland compositor: only include Qt's generated protocol headers
The system may come with conflicting headers generated by wayland-scanner.
Change-Id: I1aef7e32683ab02d0712ee65970f010a86854e43
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Diffstat (limited to 'src/qtwaylandscanner')
| -rw-r--r-- | src/qtwaylandscanner/qtwaylandscanner.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/qtwaylandscanner/qtwaylandscanner.cpp b/src/qtwaylandscanner/qtwaylandscanner.cpp index 6f1516f4b..c51916343 100644 --- a/src/qtwaylandscanner/qtwaylandscanner.cpp +++ b/src/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"); |