AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add missing "enable" fields to opengl features

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2016-07-15 15:23:21 +02:00
parent e9d822943a
commit 8cbf2aee75
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.json
View File

@ -2022,6 +2022,7 @@
}, },
"opengles2": { "opengles2": {
"description": "OpenGL ES 2.0", "description": "OpenGL ES 2.0",
"enable": "input.opengl == 'es2'",
"disable": "input.opengl == 'desktop' || input.opengl == 'no'", "disable": "input.opengl == 'desktop' || input.opengl == 'no'",
"condition": "!features.opengl-desktop && tests.opengles2", "condition": "!features.opengl-desktop && tests.opengles2",
"output": [ "output": [
@ -2043,6 +2044,7 @@
}, },
"opengl-desktop": { "opengl-desktop": {
"description": "Desktop OpenGL", "description": "Desktop OpenGL",
"enable": "input.opengl == 'desktop'",
"disable": "input.opengl == 'es2' || input.opengl == 'no'", "disable": "input.opengl == 'es2' || input.opengl == 'no'",
"condition": "(config.win32 && tests.opengl-mingw) || (!config.win32 && tests.opengl-desktop)", "condition": "(config.win32 && tests.opengl-mingw) || (!config.win32 && tests.opengl-desktop)",
"output": [ { "type": "library", "name": "OPENGL", "test": "opengl-desktop", "condition": "!config.win32" } ] "output": [ { "type": "library", "name": "OPENGL", "test": "opengl-desktop", "condition": "!config.win32" } ]