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

Convert most config tests to configure.json inline format

Browse Source 
And remove the now unused entries in config.tests. Now only the wayland-scanner
test remains, as that uses qmake features that do not easily translate to the
inline format.

This makes it much easier to port QtWayland to cmake.

This also removes some config.tests that weren't used.

Task-number: QTBUG-78177
Change-Id: Ia21a0025f9fac45b9f4815ee0f196e9e5759cdc6
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
This commit is contained in:
Johan Klokkhammer Helsing 2019-09-18 09:19:39 +02:00 committed by Johan Helsing
parent 00a2ff93f6
commit 9b228df785
1 changed files with 55 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,25 +61,76 @@
"drm-egl-server": {
"label": "DRM EGL Server",
"type": "compile",
"test": "drm_egl_server",
"test": {
"include": [
"EGL/egl.h",
"EGL/eglext.h"
],
"main": [
"#ifdef EGL_MESA_drm_image",
"return 0;",
"#else",
"#error Requires EGL_MESA_drm_image to be defined",
"return 1;",
"#endif"
]
},
"use": "egl"
},
"libhybris-egl-server": {
"label": "libhybris EGL Server",
"type": "compile",
"test": "libhybris_egl_server",
"test": {
"include": [
"EGL/egl.h",
"EGL/eglext.h",
"hybris/eglplatformcommon/hybris_nativebufferext.h"
],
"main": [
"#ifdef EGL_HYBRIS_native_buffer",
"return 0;",
"#else",
"#error Requires EGL_HYBRIS_native_buffer to be defined",
"return 1;",
"#endif"
]
},
"use": "egl"
},
"dmabuf-server-buffer": {
"label": "Linux dma-buf Buffer Sharing",
"type": "compile",
"test": "dmabuf_server_buffer",
"test": {
"include": [
"EGL/egl.h",
"EGL/eglext.h",
"drm_fourcc.h"
],
"main": [
"#ifdef EGL_LINUX_DMA_BUF_EXT",
"return 0;",
"#else",
"#error Requires EGL_LINUX_DMA_BUF_EXT",
"return 1;",
"#endif"
]
},
"use": "egl"
},
"vulkan-server-buffer": {
"label": "Vulkan Buffer Sharing",
"type": "compile",
"test": "vulkan_server_buffer"
"test": {
"include": [
"vulkan/vulkan.h"
],
"main": [
"VkExportMemoryAllocateInfoKHR exportAllocInfo = {};",
"exportAllocInfo.sType = VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_KHR;",
"exportAllocInfo.handleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR;",
"return 0;"
]
}
}
},