summaryrefslogtreecommitdiffstats
path: root/configure.json
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-07-15 15:23:21 +0200
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-07-22 10:27:52 +0000
commit8cbf2aee75e8218c09290c183f389e27b45c8bb6 (patch)
tree8480ea6400c5a17c5c2b25c8b11474c7d493c8f6 /configure.json
parente9d822943a0c1b4f8a871b7e1a05b4f8ea93cd2a (diff)
add missing "enable" fields to opengl features
this ensures that we complain if desktop gl or gles2 is explicitly requested but not available. Change-Id: Iad068ef34cdf9353cb483d4dc667ddd85ded740d Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'configure.json')
-rw-r--r--configure.json2
1 files changed, 2 insertions, 0 deletions
diff --git a/configure.json b/configure.json
index ed8560d460..e80cea27a4 100644
--- a/configure.json
+++ b/configure.json
@@ -2022,6 +2022,7 @@
},
"opengles2": {
"description": "OpenGL ES 2.0",
+ "enable": "input.opengl == 'es2'",
"disable": "input.opengl == 'desktop' || input.opengl == 'no'",
"condition": "!features.opengl-desktop && tests.opengles2",
"output": [
@@ -2043,6 +2044,7 @@
},
"opengl-desktop": {
"description": "Desktop OpenGL",
+ "enable": "input.opengl == 'desktop'",
"disable": "input.opengl == 'es2' || input.opengl == 'no'",
"condition": "(config.win32 && tests.opengl-mingw) || (!config.win32 && tests.opengl-desktop)",
"output": [ { "type": "library", "name": "OPENGL", "test": "opengl-desktop", "condition": "!config.win32" } ]