diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2021-02-09 13:12:09 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-02-10 09:13:11 +0000 |
| commit | fe38ba8cf34cd5cb8e0fc4fe80991d7171db4765 (patch) | |
| tree | 4dcf064ee2b875dd83e73765e556f3d366d0e876 /configure.json | |
| parent | 4f2f53dd7f4291976a66f821af25d32becb02345 (diff) | |
Update name of c++2a to c++20
Keep the c++2a feature, but make it an alias for compatibility
purposes.
Change-Id: I6f153109be84659806f1b7a57a88a187875166d8
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit 3c412c93c251862a2791557881f9232fd76fda79)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/configure.json b/configure.json index a9249e1ed2..56d9841119 100644 --- a/configure.json +++ b/configure.json @@ -363,18 +363,18 @@ "qmake": "CONFIG += c++11 c++14 c++17" } }, - "cxx2a": { - "label": "C++2a support", + "cxx20": { + "label": "C++20 support", "type": "compile", "test": { "head": [ "#if __cplusplus > 201703L", - "// Compiler claims to support experimental C++2a, trust it", + "// Compiler claims to support C++20, trust it", "#else", "# error __cplusplus must be > 201703L (the value for C++17)", "#endif" ], - "qmake": "CONFIG += c++11 c++14 c++17 c++2a" + "qmake": "CONFIG += c++11 c++14 c++17 c++20" } }, "precompile_header": { @@ -983,10 +983,15 @@ "condition": "features.c++17", "output": [ "publicFeature", "publicQtConfig" ] }, - "c++2a": { - "label": "C++2a", + "c++20": { + "label": "C++20", "autoDetect": false, - "condition": "features.c++17 && tests.cxx2a", + "condition": "features.c++17 && tests.cxx20", + "output": [ "publicFeature", "publicQtConfig" ] + }, + "c++2a": { + "label": "C++20", + "condition": "features.c++20", "output": [ "publicFeature", "publicQtConfig" ] }, "c89": { @@ -1520,7 +1525,7 @@ { "message": "Using C++ standard", "type": "firstAvailableFeature", - "args": "c++2a c++17 c++14 c++11" + "args": "c++20 c++17 c++14 c++11" }, { "type": "feature", |