summaryrefslogtreecommitdiffstats
path: root/configure.json
diff options
context:
space:
mode:
Diffstat (limited to 'configure.json')
-rw-r--r--configure.json22
1 files changed, 21 insertions, 1 deletions
diff --git a/configure.json b/configure.json
index da8308a80c..7f3018ed23 100644
--- a/configure.json
+++ b/configure.json
@@ -339,6 +339,20 @@
"qmake": "CONFIG += c++11 c++14 c++1z"
}
},
+ "c++2a": {
+ "label": "C++2a support",
+ "type": "compile",
+ "test": {
+ "head": [
+ "#if __cplusplus > 201703L",
+ "// Compiler claims to support experimental C++2a, trust it",
+ "#else",
+ "# error __cplusplus must be > 201703L (the value for C++17)",
+ "#endif"
+ ],
+ "qmake": "CONFIG += c++11 c++14 c++1z c++2a"
+ }
+ },
"precompile_header": {
"label": "precompiled header support",
"type": "compile",
@@ -911,6 +925,12 @@
"condition": "features.c++14 && tests.c++1z",
"output": [ "publicFeature", "publicQtConfig" ]
},
+ "c++2a": {
+ "label": "C++2a",
+ "autoDetect": false,
+ "condition": "features.c++1z && tests.c++2a",
+ "output": [ "publicFeature", "publicQtConfig" ]
+ },
"c89": {
"label": "C89"
},
@@ -1413,7 +1433,7 @@ Configure with '-qreal float' to create a build that is binary-compatible with 5
{
"message": "Using C++ standard",
"type": "firstAvailableFeature",
- "args": "c++1z c++14 c++11"
+ "args": "c++2a c++1z c++14 c++11"
},
{
"type": "feature",