summaryrefslogtreecommitdiffstats
path: root/configure.json
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2016-08-10 14:33:01 +0200
committerLars Knoll <lars.knoll@qt.io>2016-08-19 04:28:21 +0000
commit0a070d1e957a0a25bf401b10663dc3fbd7d55e27 (patch)
treeaccbfb14905faa01c95e625f156d5d287ad044dd /configure.json
parentcf166e58398779590e39f3a2635d953c6b53bd4b (diff)
Don't use QT_NO_MIMETYPE in mimetypes.pri
Instead define a proper feature for it and use qtConfig(). Change-Id: I64b1d26b2419a24d3239e9935341b7d535990dfb Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'configure.json')
-rw-r--r--configure.json4
1 files changed, 4 insertions, 0 deletions
diff --git a/configure.json b/configure.json
index f33a3fc588..f56c2651ce 100644
--- a/configure.json
+++ b/configure.json
@@ -2514,6 +2514,10 @@
"condition": "!features.shared" }
]
},
+ "mimetype": {
+ "description": "Mimetype handling",
+ "output": [ "publicFeature", "feature" ]
+ },
"extra_features": {
"comment": "### remove, once qfeatures.txt is ported to the new system",
"output": [ "extraFeatures" ]