diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-21 03:03:17 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-21 03:03:17 +0100 |
| commit | a56852daeaa290cf93b7e38dd1238fa20dc72bba (patch) | |
| tree | 0eb0ae9cefbb7839f693c2ae49a012dc83ac97db | |
| parent | 5a66bc64b0b157929c9fc76f0f4ae046393be600 (diff) | |
| parent | 67d56a5cba4fdac8205a84bc4e3ca74d5efbb64c (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I4e205974d29aef0443ad7aecdb43d5ab3ee1ec64
| -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 |