summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-05-31 18:54:04 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2017-05-31 18:54:04 +0000
commite3bc01b0e339aa3730c619fb02201aa09468d557 (patch)
treeace583c75770f52f65b9d78c62303693038f672c /src/gui
parentf33cf18d882ada727da0f378525e55d9421e3b16 (diff)
parent7ee80242de2744790e5c35662c14594981f8586d (diff)
Merge "Merge remote-tracking branch 'origin/5.9.0' into 5.9" into refs/staging/5.9
Diffstat (limited to 'src/gui')
-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 93098a4b58..a5101817b7 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -443,7 +443,6 @@
"combined-angle-lib": {
"label": "Combined ANGLE Library",
"autoDetect": false,
- "enable": "features.angle",
"condition": "features.angle",
"output": [ "publicFeature" ]
},