From a6160b7dbc47e707ef188f19fa52b5b2b572509a Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Wed, 12 Sep 2018 14:12:44 +0200 Subject: 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 --- tests/auto/compositor/compositor/compositor.pro | 1 + tests/auto/compositor/compositor/mockclient.h | 2 +- tests/auto/compositor/compositor/mockkeyboard.h | 2 +- tests/auto/compositor/compositor/mockpointer.h | 2 +- tests/auto/compositor/compositor/mockseat.h | 2 +- tests/auto/compositor/compositor/testcompositor.cpp | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) (limited to 'tests/auto/compositor/compositor') diff --git a/tests/auto/compositor/compositor/compositor.pro b/tests/auto/compositor/compositor/compositor.pro index d69db4ca5..29443f7a9 100644 --- a/tests/auto/compositor/compositor/compositor.pro +++ b/tests/auto/compositor/compositor/compositor.pro @@ -13,6 +13,7 @@ qtConfig(xkbcommon-evdev): \ WAYLANDCLIENTSOURCES += \ ../../../../src/3rdparty/protocol/xdg-shell-unstable-v5.xml \ ../../../../src/3rdparty/protocol/ivi-application.xml \ + ../../../../src/3rdparty/protocol/wayland.xml SOURCES += \ tst_compositor.cpp \ diff --git a/tests/auto/compositor/compositor/mockclient.h b/tests/auto/compositor/compositor/mockclient.h index 6bfb652ed..1d9f32774 100644 --- a/tests/auto/compositor/compositor/mockclient.h +++ b/tests/auto/compositor/compositor/mockclient.h @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include +#include "wayland-wayland-client-protocol.h" #include #include diff --git a/tests/auto/compositor/compositor/mockkeyboard.h b/tests/auto/compositor/compositor/mockkeyboard.h index 1090db597..fd7f06aee 100644 --- a/tests/auto/compositor/compositor/mockkeyboard.h +++ b/tests/auto/compositor/compositor/mockkeyboard.h @@ -30,7 +30,7 @@ #define MOCKKEYBOARD_H #include -#include +#include "wayland-wayland-client-protocol.h" class MockKeyboard : public QObject { diff --git a/tests/auto/compositor/compositor/mockpointer.h b/tests/auto/compositor/compositor/mockpointer.h index 2054040fd..db6b2b69c 100644 --- a/tests/auto/compositor/compositor/mockpointer.h +++ b/tests/auto/compositor/compositor/mockpointer.h @@ -30,7 +30,7 @@ #define MOCKPOINTER_H #include -#include +#include "wayland-wayland-client-protocol.h" class MockPointer : public QObject { diff --git a/tests/auto/compositor/compositor/mockseat.h b/tests/auto/compositor/compositor/mockseat.h index f8c103ed4..0d0f4074c 100644 --- a/tests/auto/compositor/compositor/mockseat.h +++ b/tests/auto/compositor/compositor/mockseat.h @@ -32,7 +32,7 @@ #include "mockkeyboard.h" #include -#include +#include "wayland-wayland-client-protocol.h" class MockSeat : public QObject { diff --git a/tests/auto/compositor/compositor/testcompositor.cpp b/tests/auto/compositor/compositor/testcompositor.cpp index 710bb7b3a..22ecf28cb 100644 --- a/tests/auto/compositor/compositor/testcompositor.cpp +++ b/tests/auto/compositor/compositor/testcompositor.cpp @@ -30,7 +30,7 @@ #include "testseat.h" #include "testkeyboardgrabber.h" -#include +#include TestCompositor::TestCompositor(bool createInputDev) : shell(new QWaylandWlShell(this)) -- cgit v1.2.3