From d1d0e2d6b03e12f725fdf2f55e0bdabab6775bb2 Mon Sep 17 00:00:00 2001
From: James McDonnell <jmcdonnell@blackberry.com>
Date: Thu, 5 Dec 2019 12:12:37 -0500
Subject: [PATCH] Enable QtWayland for QNX

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>
---
 src/plugins/platforms/wayland/configure.json | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/plugins/platforms/wayland/configure.json b/src/plugins/platforms/wayland/configure.json
index 7d446824062..9b8b4345741 100644
--- a/src/plugins/platforms/wayland/configure.json
+++ b/src/plugins/platforms/wayland/configure.json
@@ -168,6 +168,21 @@
                     "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": {
             "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" ]
         },
         "wayland-brcm": {
@@ -238,7 +253,7 @@
         },
         "wayland-drm-egl-server-buffer": {
             "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" ]
         },
         "wayland-libhybris-egl-server-buffer": {