summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms
diff options
context:
space:
mode:
authorOliver Wolff <oliver.wolff@qt.io>2017-05-04 10:15:23 +0200
committerJani Heikkinen <jani.heikkinen@qt.io>2017-05-11 08:35:54 +0000
commit3f1548ae82d4321b6fdbbf127dafbdf385374be0 (patch)
tree192268eed3cb0fea123e93c721d9319f372991fb /src/plugins/platforms
parent67f466505e1aed6b7f87e766141d081146b4159c (diff)
Restore behavior of using libEGL and libGLESv2 as default for angle
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 <oswald.buddenhagen@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/plugins/platforms')
-rw-r--r--src/plugins/platforms/windows/windows.pri11
1 files changed, 9 insertions, 2 deletions
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}
+}