summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOliver Wolff <oliver.wolff@qt.io>2017-05-16 08:09:00 +0200
committerLars Knoll <lars.knoll@qt.io>2017-05-17 13:42:53 +0000
commitb53858e609c22ed38bcc05fdbaa898697a98352d (patch)
tree343f6d3752cb49fdd8072c0f3c0c0586a9d391b2 /src
parent51f095e655ce8b4b1d73d0d11817bb839a91c1df (diff)
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>
Diffstat (limited to 'src')
-rw-r--r--src/gui/configure.json1
1 files changed, 1 insertions, 0 deletions
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" ]
},