From 3196527c1a2a055649792c7ad271f1c90976dc73 Mon Sep 17 00:00:00 2001 From: Lars Knoll 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 Reviewed-by: Oswald Buddenhagen --- mkspecs/features/win32/opengl.prf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'mkspecs/features/win32') 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 -- cgit v1.2.3