summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Wolff <oliver.wolff@qt.io>2017-05-16 08:11:08 +0200
committerJani Heikkinen <jani.heikkinen@qt.io>2017-05-19 17:40:12 +0000
commit31374105940bb15a68683a0ae691e7fe1f9b049a (patch)
treec70b5699dab2d12ea2553c19a84a87cb76befa70
parent9954187adba4d26a1b1aa93874993f15d6d8a0b9 (diff)
Revert "Enable "combined-angle-lib" for ANGLE builds"v5.9.0-rc1
Combining libEGL and libGLESv2 into QtANGLE cannot be the default any longer, as the change was binary incompatible. We just had to return to previous behavior temporarily to be able to fix qtlocation. This reverts commit 97ab65076e30d8cd0cbe6bdbdb51d1dc2c0ff7e7. Task-number: QTBUG-60795 Change-Id: I3095cb5f9da30e2d873d9a186cfbc5aee3fb10b2 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
-rw-r--r--src/gui/configure.json1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json
index 306ce13214..73e59a7ad9 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -430,7 +430,6 @@
"combined-angle-lib": {
"label": "Combined ANGLE Library",
"autoDetect": false,
- "enable": "features.angle",
"condition": "features.angle",
"output": [ "publicFeature" ]
},