From b53858e609c22ed38bcc05fdbaa898697a98352d Mon Sep 17 00:00:00 2001
From: Oliver Wolff <oliver.wolff@qt.io>
Date: Tue, 16 May 2017 08:09:00 +0200
Subject: Enable "combined-angle-lib" for ANGLE builds

As qtlocation's mapboxgl plugin links to QtANGLE if dynamic opengl is
used, we have to keep the combined library being the default until
qtlocation is fixed.
As soon as the qtlocation fix has landed in 5.9.0 this change should be
reverted.

Task-number: QTBUG-60795
Change-Id: I0781695e085a28a8971a6245a352413c0f779025
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 src/gui/configure.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gui/configure.json b/src/gui/configure.json
index 73e59a7ad9..306ce13214 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -430,6 +430,7 @@
         "combined-angle-lib": {
             "label": "Combined ANGLE Library",
             "autoDetect": false,
+            "enable": "features.angle",
             "condition": "features.angle",
             "output": [ "publicFeature" ]
         },
-- 
cgit v1.2.3