diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-25 03:04:40 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-25 03:04:40 +0100 |
| commit | 4874891102a5fd65942c0b58b7ad981c930a97a9 (patch) | |
| tree | 154676a66110ae9ea689e298d8458c70ef9c272a | |
| parent | ec10511b6cef317a16de238585c73e063ef9cfd7 (diff) | |
| parent | a56852daeaa290cf93b7e38dd1238fa20dc72bba (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I62f1cbbf543021a9569e4d1e8c4f9e7c554e77f3
| -rw-r--r-- | src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h index 02b5b6f88..56a710c3d 100644 --- a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h +++ b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h @@ -59,8 +59,10 @@ #endif // Copied from eglmesaext.h +#ifndef EGL_WL_bind_wayland_display typedef EGLBoolean (EGLAPIENTRYP PFNEGLBINDWAYLANDDISPLAYWL) (EGLDisplay dpy, struct wl_display *display); typedef EGLBoolean (EGLAPIENTRYP PFNEGLUNBINDWAYLANDDISPLAYWL) (EGLDisplay dpy, struct wl_display *display); +#endif QT_BEGIN_NAMESPACE |