From 3f1548ae82d4321b6fdbbf127dafbdf385374be0 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Thu, 4 May 2017 10:15:23 +0200 Subject: Restore behavior of using libEGL and libGLESv2 as default for angle MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As Qt applications using OpenGL are linked against these libs, merging them into QtANGLE by default (780105f9062dec350bbe2a6800c40db3e6382578) was a binary incompatible change. This change restores the default behavior to the one before given change. If the user wants the libraries to be merged, he can pass combined-angle-lib to configure. Task-number: QTBUG-60373 Change-Id: Iedbd3f2ce9284fdde924cfae8d915d6d5fef00db Reviewed-by: Oswald Buddenhagen Reviewed-by: Friedemann Kleint Reviewed-by: Jan Arve Sæther Reviewed-by: Joerg Bornemann --- mkspecs/features/win32/opengl.prf | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'mkspecs/features') diff --git a/mkspecs/features/win32/opengl.prf b/mkspecs/features/win32/opengl.prf index ebc29d0923..c6fba7770f 100644 --- a/mkspecs/features/win32/opengl.prf +++ b/mkspecs/features/win32/opengl.prf @@ -1,4 +1,14 @@ +QT_FOR_CONFIG += gui + qtConfig(opengles2) { + # Depending on the configuration we use libQtANGLE or libEGL and libGLESv2 + qtConfig(combined-angle-lib) { + QMAKE_LIBS_OPENGL_ES2 = -l$${LIBQTANGLE_NAME} $$QMAKE_LIBS_OPENGL_ES2 + QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBQTANGLE_NAME}d $$QMAKE_LIBS_OPENGL_ES2_DEBUG + } else { + QMAKE_LIBS_OPENGL_ES2 = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} $$QMAKE_LIBS_OPENGL_ES2 + QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBEGL_NAME}d -l$${LIBGLESV2_NAME}d $$QMAKE_LIBS_OPENGL_ES2_DEBUG + } # For Desktop, use the ANGLE library location passed on from configure. INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2 CONFIG(debug, debug|release) { -- cgit v1.2.3