summaryrefslogtreecommitdiffstats
path: root/src/gui/configure.json
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-11-29 01:01:07 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-11-29 01:01:08 +0100
commitad4ef9836c3142e13a4dc125832a7f0adb5b5d0e (patch)
tree3e590680d6db678c87436cd252dd9d03d52534fe /src/gui/configure.json
parentcd200ad7aef1884a5c36528d5c3933c46c86510f (diff)
parent512c1febbd9d5b8af767b2604d6ee97f1fdee4d9 (diff)
Merge remote-tracking branch 'origin/5.15' into dev
Diffstat (limited to 'src/gui/configure.json')
-rw-r--r--src/gui/configure.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json
index 3478f51902..3891ff4070 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" }