summaryrefslogtreecommitdiffstats
path: root/configure.json
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-04-17 15:45:58 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-04-18 22:26:27 +0000
commit38deb05109bcee9ad25a10eff024eaf8ce7a57f1 (patch)
treef31b59cae085588e5d405d3f32cabbbae592b293 /configure.json
parent8ae8c6690b41f6cd40dae14d471ce29b500c66c9 (diff)
Rename c++1z to c++17 in the configure api
It is 2019, so the name c++17 is more than fixed by now. At the same time remove an old restriction on using -c++std= with MSVC, since VS2017 (15.7), we have been able to request c++14 and c++17. Change-Id: I7129799a2e46301b7ec1322251a3805f4d6b20a8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'configure.json')
-rw-r--r--configure.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.json b/configure.json
index f7449ec068..da8308a80c 100644
--- a/configure.json
+++ b/configure.json
@@ -319,7 +319,7 @@
}
},
"c++1z": {
- "label": "C++1z support",
+ "label": "C++17 support",
"type": "compile",
"test": {
"head": [
@@ -907,7 +907,7 @@
"output": [ "publicFeature", "publicQtConfig" ]
},
"c++1z": {
- "label": "C++1z",
+ "label": "C++17",
"condition": "features.c++14 && tests.c++1z",
"output": [ "publicFeature", "publicQtConfig" ]
},