Revert "Enable "combined-angle-lib" for ANGLE builds"

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>
bb10
Oliver Wolff 2017-05-16 08:11:08 +02:00 committed by Jani Heikkinen
parent 9954187adb
commit 3137410594
1 changed files with 0 additions and 1 deletions

View File

@ -430,7 +430,6 @@
"combined-angle-lib": {
"label": "Combined ANGLE Library",
"autoDetect": false,
"enable": "features.angle",
"condition": "features.angle",
"output": [ "publicFeature" ]
},