From accc40f323b2eb284a9c2767a29659ebbb135b14 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@qt.io>
Date: Wed, 30 Oct 2019 14:45:47 +0100
Subject: Fix check for EGL on INTEGRITY

This fixes a regression introduced in c00487d588f.

Fixes: QTBUG-79285
Change-Id: I95f073d019d6e909f8de132ea9f27002043d5d52
Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
Reviewed-by: Timo Aarnipuro <timo.aarnipuro@qt.io>
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@tqcs.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 src/gui/configure.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/gui/configure.json')

diff --git a/src/gui/configure.json b/src/gui/configure.json
index c2793bf236..19312d245d 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -1375,7 +1375,7 @@
         },
         "egl": {
             "label": "EGL",
-            "condition": "(features.opengl || features.openvg) && (features.angle || libs.egl) && (features.dlopen || !config.unix)",
+            "condition": "(features.opengl || features.openvg) && (features.angle || libs.egl) && (features.dlopen || !config.unix || config.integrity)",
             "output": [ "privateFeature", "feature" ]
         },
         "egl_x11": {
-- 
cgit v1.2.3


From 20891777bb8b295a26e3fb2b9f5b2c59fcff66dd Mon Sep 17 00:00:00 2001
From: Lorn Potter <lorn.potter@gmail.com>
Date: Fri, 6 Apr 2018 15:57:49 +1000
Subject: webassembly: enable opengl es3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Our WebGL 2 support is half finished, since we use surface format verion of 3
to map to webgl2, but do not enable Open GL ES3 needed for WebGL2 support.

This allows glDrawArrays and glDrawElements to be used

Change-Id: Ifbd434f4d25e49f671145a6727999a90920d6810
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
---
 src/gui/configure.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/gui/configure.json')

diff --git a/src/gui/configure.json b/src/gui/configure.json
index 134a2e0a15..7f4d7cc6af 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -1315,7 +1315,7 @@
         },
         "opengles3": {
             "label": "OpenGL ES 3.0",
-            "condition": "features.opengles2 && !features.angle && tests.opengles3 && !config.wasm",
+            "condition": "features.opengles2 && !features.angle && tests.opengles3",
             "output": [
                 "publicFeature",
                 { "type": "define", "name": "QT_OPENGL_ES_3" }
-- 
cgit v1.2.3


From 98f19f00361bf25097281cae5dfa833ba7db8a2f Mon Sep 17 00:00:00 2001
From: Marius Kittler <mariuskittler@gmx.de>
Date: Sat, 7 Sep 2019 20:05:42 +0200
Subject: Use pkg-config to find libjpeg

Change-Id: I42d877fbca5d746114cc28f8ee4db3e54754cd24
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/gui/configure.json | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/gui/configure.json')

diff --git a/src/gui/configure.json b/src/gui/configure.json
index 19312d245d..0202f17b21 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -374,6 +374,7 @@
             },
             "headers": "jpeglib.h",
             "sources": [
+                { "type": "pkgConfig", "args": "libjpeg" },
                 { "libs": "-llibjpeg", "condition": "config.msvc" },
                 "-ljpeg"
             ]
-- 
cgit v1.2.3