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 --- src/plugins/platforms/windows/windows.pri | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/plugins/platforms/windows/windows.pri') diff --git a/src/plugins/platforms/windows/windows.pri b/src/plugins/platforms/windows/windows.pri index 7d3ecc8aa2..73677311f5 100644 --- a/src/plugins/platforms/windows/windows.pri +++ b/src/plugins/platforms/windows/windows.pri @@ -1,6 +1,8 @@ # Note: OpenGL32 must precede Gdi32 as it overwrites some functions. LIBS += -lole32 -luser32 -lwinspool -limm32 -lwinmm -loleaut32 +QT_FOR_CONFIG += gui + qtConfig(opengl):!qtConfig(opengles2):!qtConfig(dynamicgl): LIBS *= -lopengl32 mingw: LIBS *= -luuid @@ -99,5 +101,10 @@ RESOURCES += $$PWD/openglblacklists.qrc qtConfig(accessibility): include($$PWD/accessible/accessible.pri) -DEFINES *= LIBEGL_NAME=$${LIBQTANGLE_NAME} -DEFINES *= LIBGLESV2_NAME=$${LIBQTANGLE_NAME} +qtConfig(combined-angle-lib) { + DEFINES *= LIBEGL_NAME=$${LIBQTANGLE_NAME} + DEFINES *= LIBGLESV2_NAME=$${LIBQTANGLE_NAME} +} else { + DEFINES *= LIBEGL_NAME=$${LIBEGL_NAME} + DEFINES *= LIBGLESV2_NAME=$${LIBGLESV2_NAME} +} -- cgit v1.2.3