diff options
| author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-12-02 10:30:40 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-12-02 10:35:50 +0100 |
| commit | 3698b116a1973146b76319673cdb6787f13f2de6 (patch) | |
| tree | de31e4c3365d6852ed1f41621960ac9e48e85106 /src/hardwareintegration/compositor/wayland-egl | |
| parent | 68993c012b88df43b2cd75a8c8704092760f28c0 (diff) | |
| parent | 4d3c3a08eba8d30805f18397c98e19ab9fd40722 (diff) | |
Merge remote-tracking branch 'qt/5.6' into wip-compositor-api
Change-Id: Ie70fdd03e1259a8cb75bbdbf1324e3e4a2b51807
Diffstat (limited to 'src/hardwareintegration/compositor/wayland-egl')
| -rw-r--r-- | src/hardwareintegration/compositor/wayland-egl/wayland-egl.pri | 6 | ||||
| -rw-r--r-- | src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/hardwareintegration/compositor/wayland-egl/wayland-egl.pri b/src/hardwareintegration/compositor/wayland-egl/wayland-egl.pri index 2d4771a2a..8dacc130b 100644 --- a/src/hardwareintegration/compositor/wayland-egl/wayland-egl.pri +++ b/src/hardwareintegration/compositor/wayland-egl/wayland-egl.pri @@ -2,11 +2,13 @@ INCLUDEPATH += $$PWD !contains(QT_CONFIG, no-pkg-config) { CONFIG += link_pkgconfig - PKGCONFIG += wayland-server wayland-egl egl + PKGCONFIG += wayland-server wayland-egl } else { - LIBS += -lwayland-egl -lwayland-server -lEGL + LIBS += -lwayland-egl -lwayland-server } +CONFIG += egl + SOURCES += \ $$PWD/waylandeglclientbufferintegration.cpp diff --git a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp index 42636990f..fc2d145f5 100644 --- a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp +++ b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp @@ -54,6 +54,10 @@ #define GL_TEXTURE_EXTERNAL_OES 0x8D65 #endif +#ifndef EGL_WAYLAND_BUFFER_WL +#define EGL_WAYLAND_BUFFER_WL 0x31D5 +#endif + /* Needed for compatibility with Mesa older than 10.0. */ typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYWAYLANDBUFFERWL_compat) (EGLDisplay dpy, struct wl_resource *buffer, EGLint attribute, EGLint *value); |