1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable QtWayland for QNX

Browse Source 
Make EGL 1.5 with EGL_PLATFORM_WAYLAND_EXT a requirement for QNX and
add some EGL 1.5 code alternatives.  Avoids the need to deal with
incompatibility problems between the QNX native display/window type
and Wayland display/window type.

Change-Id: Ib26a020e1f8c7f570c6af08697d8c8153c887294
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Reviewed-by: Dan Cape <dcape@qnx.com>
This commit is contained in:
James McDonnell 2019-12-05 12:12:37 -05:00
parent 84549ae23d
commit d1d0e2d6b0
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/platforms/wayland/configure.json
View File

@ -168,6 +168,21 @@
"return 0;" "return 0;"
] ]
} }
},
"egl_1_5-wayland": {
"label": "EGL 1.5 with Wayland Platform",
"type": "compile",
"test": {
"include": [
"EGL/egl.h",
"EGL/eglext.h",
"wayland-client.h"
],
"main": [
"eglGetPlatformDisplay(EGL_PLATFORM_WAYLAND_EXT, (struct wl_display *)(nullptr), nullptr);"
]
},
"use": "egl"
} }
}, },
@ -218,7 +233,7 @@
}, },
"wayland-egl": { "wayland-egl": {
"label": "EGL", "label": "EGL",
"condition": "features.wayland-client && features.opengl && features.egl && libs.wayland-egl", "condition": "features.wayland-client && features.opengl && features.egl && libs.wayland-egl && (!config.qnx || tests.egl_1_5-wayland)",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"wayland-brcm": { "wayland-brcm": {
@ -238,7 +253,7 @@
}, },
"wayland-drm-egl-server-buffer": { "wayland-drm-egl-server-buffer": {
"label": "DRM EGL", "label": "DRM EGL",
"condition": "features.wayland-client && features.opengl && features.egl && tests.drm-egl-server", "condition": "features.wayland-client && features.opengl && features.egl && tests.drm-egl-server && (!config.qnx || tests.egl_1_5-wayland)",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"wayland-libhybris-egl-server-buffer": { "wayland-libhybris-egl-server-buffer": {