diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-08-15 21:56:36 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-08-19 04:28:40 +0000 |
| commit | 3196527c1a2a055649792c7ad271f1c90976dc73 (patch) | |
| tree | 5673d9da7ab4988750dfe8986a44a5c9b2f39717 | |
| parent | fd89fb4566501b3b4a34e25fefa882e97498e3ff (diff) | |
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>
| -rw-r--r-- | configure.json | 5 | ||||
| -rw-r--r-- | mkspecs/features/win32/opengl.prf | 3 |
2 files changed, 5 insertions, 3 deletions
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", diff --git a/mkspecs/features/win32/opengl.prf b/mkspecs/features/win32/opengl.prf index c2c4b1ac6c..ebc29d0923 100644 --- a/mkspecs/features/win32/opengl.prf +++ b/mkspecs/features/win32/opengl.prf @@ -12,8 +12,7 @@ qtConfig(opengles2) { LIBS += $$QMAKE_LIBS_OPENGL_ES2 QMAKE_LIBDIR += $$QMAKE_LIBDIR_OPENGL_ES2_RELEASE } - DEFINES += QT_OPENGL_ES_2 QT_OPENGL_ES_2_ANGLE - qtConfig(static): DEFINES += QT_OPENGL_ES_2_ANGLE_STATIC GL_APICALL= EGLAPI= + qtConfig(static): DEFINES += GL_APICALL= EGLAPI= } else { !qtConfig(dynamicgl) { QMAKE_LIBS += $$QMAKE_LIBS_OPENGL |