path: root/config_help.txt
diff options
authorOliver Wolff <>2017-05-04 10:15:23 +0200
committerJani Heikkinen <>2017-05-11 08:35:54 +0000
commit3f1548ae82d4321b6fdbbf127dafbdf385374be0 (patch)
tree192268eed3cb0fea123e93c721d9319f372991fb /config_help.txt
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 <> Reviewed-by: Friedemann Kleint <> Reviewed-by: Jan Arve Sæther <> Reviewed-by: Joerg Bornemann <>
Diffstat (limited to 'config_help.txt')
1 files changed, 1 insertions, 0 deletions
diff --git a/config_help.txt b/config_help.txt
index 2cf8c8d885..d1b0ac56b0 100644
--- a/config_help.txt
+++ b/config_help.txt
@@ -256,6 +256,7 @@ Gui, printing, widget options:
-opengles3 ........... Enable OpenGL ES 3.x support instead of ES 2.x [auto]
-angle ............... Use bundled ANGLE to support OpenGL ES 2.0 [auto]
(Windows only)
+ -combined-angle-lib .. Merge LibEGL and LibGLESv2 into LibANGLE (Windows only)
-qpa <name> .......... Select default QPA backend (e.g., xcb, cocoa, windows)
-xcb-xlib............. Enable Xcb-Xlib support [auto]