diff options
author | Oliver Wolff <oliver.wolff@qt.io> | 2017-05-04 10:15:23 +0200 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2017-05-11 08:35:54 +0000 |
commit | 3f1548ae82d4321b6fdbbf127dafbdf385374be0 (patch) | |
tree | 192268eed3cb0fea123e93c721d9319f372991fb /src/gui/configure.json | |
parent | 67f466505e1aed6b7f87e766141d081146b4159c (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/gui/configure.json')
-rw-r--r-- | src/gui/configure.json | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index f8cee387b8..73e59a7ad9 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -9,6 +9,7 @@ "options": { "accessibility": "boolean", "angle": "boolean", + "combined-angle-lib": "boolean", "direct2d": "boolean", "directfb": "boolean", "directwrite": "boolean", @@ -426,6 +427,12 @@ { "type": "define", "name": "QT_OPENGL_ES_2_ANGLE" } ] }, + "combined-angle-lib": { + "label": "Combined ANGLE Library", + "autoDetect": false, + "condition": "features.angle", + "output": [ "publicFeature" ] + }, "directfb": { "label": "DirectFB", "section": "Platform plugins", @@ -1077,6 +1084,11 @@ QMAKE_LIBDIR_OPENGL[_ES2] and QMAKE_LIBS_OPENGL[_ES2] in the mkspec for your pla "args": "angle", "condition": "config.win32" }, + { + "type": "feature", + "args": "combined-angle-lib", + "condition": "features.angle" + }, "opengl-desktop", { "type": "feature", |