summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeander Beernaert <leander.beernaert@qt.io>2020-03-05 15:32:05 +0100
committerLeander Beernaert <leander.beernaert@qt.io>2020-03-09 09:57:58 +0100
commita64f4b405222527a72fb087226801c52ddf54ef0 (patch)
treea56fa1b8acd3edc289ff7c4c6fcfe11e40b50fbc
parent627351f561bcdb8234ccf62ea2b19178eb6fa033 (diff)
Simplify OpenGL and OpenGL ES2 library tests in Gui's configure.json
Change OpenGL and OpenGL ES2 library tests to just include the header file in the test header code. This mimics what the OpenGL ES3 library tests does. Change-Id: Ic63879ea100bc66cf58ffd660e89c5803c6e29e6 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--src/gui/configure.json14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json
index 8bc3e8dc0c..d2415f7d48 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -442,6 +442,7 @@
"# include <OpenGL/gl.h>",
"#else",
"# define GL_GLEXT_PROTOTYPES",
+ "# include <GL/gl.h>",
"#endif"
],
"main": [
@@ -452,12 +453,6 @@
"glEnd();"
]
},
- "headers": [
- {
- "condition": "!config.darwin",
- "headers": "GL/gl.h"
- }
- ],
"sources": [
{ "type": "pkgConfig", "args": "gl", "condition": "!config.darwin" },
{ "type": "makeSpec", "spec": "OPENGL" }
@@ -471,6 +466,7 @@
"# include <OpenGLES/ES2/gl.h>",
"#else",
"# define GL_GLEXT_PROTOTYPES",
+ "# include <GLES2/gl2.h>",
"#endif"
],
"main": [
@@ -478,12 +474,6 @@
"glClear(GL_COLOR_BUFFER_BIT);"
]
},
- "headers": [
- {
- "condition": "!config.darwin",
- "headers": "GLES2/gl2.h"
- }
- ],
"sources": [
{ "type": "pkgConfig", "args": "glesv2", "condition": "!config.darwin" },
{ "type": "makeSpec", "spec": "OPENGL_ES2" }