From 0a8ff3b31bd1cf4d0d0de48362b7d8b9b8a7ed5c Mon Sep 17 00:00:00 2001 From: Laszlo Agocs <laszlo.agocs@qt.io> Date: Thu, 4 Aug 2016 14:28:50 +0200 Subject: [PATCH] Fix for wayland-egl on DRIVE CX Have to adapt after the changes in qtbase Task-number: QTBUG-55140 Change-Id: I5b5c981514c7ea2898c631db579d4d7d43975e3d Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com> Reviewed-by: Andy Nichols <andy.nichols@qt.io> --- .../client/wayland-egl/qwaylandeglinclude.h | 3 +-- src/hardwareintegration/client/wayland-egl/wayland-egl.pri | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglinclude.h b/src/hardwareintegration/client/wayland-egl/qwaylandeglinclude.h index 078da030..024809ff 100644 --- a/src/hardwareintegration/client/wayland-egl/qwaylandeglinclude.h +++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglinclude.h @@ -46,7 +46,6 @@ #include <wayland-egl.h> #define EGL_EGLEXT_PROTOTYPES -#include <EGL/egl.h> -#include <EGL/eglext.h> +#include <QtPlatformSupport/private/qt_egl_p.h> #endif // QWAYLANDEGLINCLUDE_H diff --git a/src/hardwareintegration/client/wayland-egl/wayland-egl.pri b/src/hardwareintegration/client/wayland-egl/wayland-egl.pri index c5e01f12..520c1eb0 100644 --- a/src/hardwareintegration/client/wayland-egl/wayland-egl.pri +++ b/src/hardwareintegration/client/wayland-egl/wayland-egl.pri @@ -6,6 +6,7 @@ INCLUDEPATH += $$PWD LIBS += -lwayland-client -lwayland-egl } +DEFINES += QT_EGL_WAYLAND CONFIG += egl QT += platformsupport-private -- GitLab