diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2019-10-01 12:45:42 +0200 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2019-10-02 14:05:02 +0000 |
| commit | 1affd453af685b89b84e8e7a970ba3a8843dfba9 (patch) | |
| tree | 0cb70e75840e76c2a45cddba064eda8d94f197e5 /configure.json | |
| parent | 5d3e6ef9092eb1e2fb59d3198c770561cdc517c7 (diff) | |
Add c++17 config feature
The c++1z feature can stay for now
Change-Id: I899c7b6de822a4533d589c05aaa0066dfddfb977
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/configure.json b/configure.json index 70ad9440c8..f9120fb202 100644 --- a/configure.json +++ b/configure.json @@ -336,13 +336,13 @@ "qmake": "CONFIG += c++11 c++14" } }, - "c++1z": { + "c++17": { "label": "C++17 support", "type": "compile", "test": { "head": [ "#if __cplusplus > 201402L", - "// Compiler claims to support experimental C++1z, trust it", + "// Compiler claims to support C++17, trust it", "#else", "# error __cplusplus must be > 201402L (the value for C++14)", "#endif", @@ -354,7 +354,7 @@ "int i = std::get<int>(v);", "std::visit([](const auto &) { return 1; }, v);" ], - "qmake": "CONFIG += c++11 c++14 c++1z" + "qmake": "CONFIG += c++11 c++14 c++17" } }, "c++2a": { @@ -368,7 +368,7 @@ "# error __cplusplus must be > 201703L (the value for C++17)", "#endif" ], - "qmake": "CONFIG += c++11 c++14 c++1z c++2a" + "qmake": "CONFIG += c++11 c++14 c++17 c++2a" } }, "precompile_header": { @@ -950,15 +950,20 @@ "condition": "features.c++11 && tests.c++14", "output": [ "publicFeature", "publicQtConfig" ] }, + "c++17": { + "label": "C++17", + "condition": "features.c++14 && tests.c++17", + "output": [ "publicFeature", "publicQtConfig" ] + }, "c++1z": { "label": "C++17", - "condition": "features.c++14 && tests.c++1z", + "condition": "features.c++17", "output": [ "publicFeature", "publicQtConfig" ] }, "c++2a": { "label": "C++2a", "autoDetect": false, - "condition": "features.c++1z && tests.c++2a", + "condition": "features.c++17 && tests.c++2a", "output": [ "publicFeature", "publicQtConfig" ] }, "c89": { @@ -1485,7 +1490,7 @@ Configure with '-qreal float' to create a build that is binary-compatible with 5 { "message": "Using C++ standard", "type": "firstAvailableFeature", - "args": "c++2a c++1z c++14 c++11" + "args": "c++2a c++17 c++14 c++11" }, { "type": "feature", |