From a64f4b405222527a72fb087226801c52ddf54ef0 Mon Sep 17 00:00:00 2001
From: Leander Beernaert <leander.beernaert@qt.io>
Date: Thu, 5 Mar 2020 15:32:05 +0100
Subject: 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>
---
 src/gui/configure.json | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

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

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" }
-- 
cgit v1.2.3