summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2019-08-06 19:48:49 +0200
committerTor Arne Vestbø <tor.arne.vestbo@qt.io>2019-08-07 04:10:03 +0000
commit88b1dd29c885aa35255b9ec1c824c5e5d7ba3789 (patch)
tree6247aee2d8de1300e4d3f5b0e05a6625b4535ca8
parentf184f8780fef920006cf71e38b1477fe975bc3b1 (diff)
iOS: Disable C++17
The standard library on some of the deployment targets (iOS 8 to 10) does not have aligned new and delete operators. Allowing C++17 would make us think we could use those, and the build would fail with the aligned-allocation-unavailable diagnostic. Fixes: QTBUG-77197 Change-Id: I86dc1dc97929b0c9359b4d7cc8dbca85672111dc Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r--configure.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.json b/configure.json
index ce20aa3dc1..1a22783177 100644
--- a/configure.json
+++ b/configure.json
@@ -896,7 +896,7 @@
},
"c++1z": {
"label": "C++1z",
- "condition": "features.c++14 && tests.c++1z",
+ "condition": "features.c++14 && tests.c++1z && !config.uikit",
"output": [ "publicFeature", "publicQtConfig" ]
},
"precompile_header": {