summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2018-09-12 16:01:16 +0200
committerJohan Helsing <johan.helsing@qt.io>2018-10-05 08:15:38 +0000
commita8148e51577df281491cd1c60f428ade9b4def11 (patch)
treeae0031c5897fb860983fda3d588ab5888f6006fb /src/plugins/platforms
parent4bdd8d4ecac42be9e93faa7a2b9ae3448c4f989e (diff)
waylandscanner: use --include-core-only
In order to ship our own version of wayland.xml protocol code we need to get rid of all includes of system versions of wayland-client-protocol.h and wayland-server-portocol.h. These were unfortunately included by wayland-client.h and wayland-server.h and now can't be removed because of compatibility issues. To solve this, wayland-client-core.h and wayland-server-core.h can be included instead, which don't include any generated protocol code. Again, due to compatibility concerns, wayland-scanner does not use these versions unless invoked with --include-core-only, which is what this patch fixes. Task-number: QTBUG-70553 Change-Id: Icf7c870bd4d5bf891628cbddce2a9de3dda50164 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'src/plugins/platforms')
0 files changed, 0 insertions, 0 deletions