diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2018-09-12 14:12:44 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2018-10-03 08:36:56 +0000 |
| commit | a6160b7dbc47e707ef188f19fa52b5b2b572509a (patch) | |
| tree | 0503595b838efe1a0f27d410382d82974d73e765 /src/hardwareintegration/client/wayland-egl/qwaylandeglinclude.h | |
| parent | 9c5d1b634ea82fdc1b09713da4565b905d2c9123 (diff) | |
| download | qtwayland-a6160b7dbc47e707ef188f19fa52b5b2b572509a.tar.gz | |
Don't include system versions of wayland protocol
wayland-client.h and wayland-server.h includes protocol generated for the
version of wayland.xml corresponding to the libwayland version. This becomes a
problem when we want to support a version of wayland.xml that's newer than the
system libwayland.
The solution is to include wayland-client-core.h and wayland-client-server.h
instead. These headers don't include any wayland-scanner generated code, so we
can safely compile and link code generated against the version of wayland.xml
that we ship.
[ChangeLog] Code generated by qtwaylandscanner now includes
wayland-client-core.h and wayland-server-core.h instead of wayland-client.h and
wayland-server.h. This might break source compatibility for code using custom
wayland extensions.
Fixes: QTBUG-70553
Change-Id: Ice0cdb60ecc4f936acc0e158b96f7978549f62c1
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'src/hardwareintegration/client/wayland-egl/qwaylandeglinclude.h')
| -rw-r--r-- | src/hardwareintegration/client/wayland-egl/qwaylandeglinclude.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglinclude.h b/src/hardwareintegration/client/wayland-egl/qwaylandeglinclude.h index 233ce78b..e9998b83 100644 --- a/src/hardwareintegration/client/wayland-egl/qwaylandeglinclude.h +++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglinclude.h @@ -41,7 +41,7 @@ #define QWAYLANDEGLINCLUDE_H #include <string.h> -#include <wayland-client.h> +#include <wayland-client-core.h> #include <wayland-egl.h> |