From 3196527c1a2a055649792c7ad271f1c90976dc73 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Mon, 15 Aug 2016 21:56:36 +0200
Subject: Don't define QT_OPENGL_ES_2* in opengl.prf

Defining QT_OPENGL_ES_2 would only lead to conflicts with defines from
qconfig.h.
QT_OPENGL_ES_2_ANGLE also moves to the .pri.
QT_OPENGL_ES_2_ANGLE_STATIC is not used and is removed altogether.

Change-Id: I614fb00525ac696e066ac8328bb9bf61fca08a01
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
---
 configure.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'configure.json')

diff --git a/configure.json b/configure.json
index f3c6f247f9..94514b1869 100644
--- a/configure.json
+++ b/configure.json
@@ -2305,7 +2305,10 @@
             "description": "ANGLE",
             "autoDetect": "features.opengles2 || features.opengl-dynamic",
             "condition": "config.win32 && tests.directx",
-            "output": [ "privateFeature" ]
+            "output": [
+                "privateFeature",
+                { "type": "define", "name": "QT_OPENGL_ES_2_ANGLE" }
+            ]
         },
         "opengles2": {
             "description": "OpenGL ES 2.0",
-- 
cgit v1.2.3