diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2021-02-09 13:12:09 +0100 |
|---|---|---|
| committer | Kai Köhne <kai.koehne@qt.io> | 2021-02-10 07:54:06 +0100 |
| commit | 3c412c93c251862a2791557881f9232fd76fda79 (patch) | |
| tree | 1096e4230416ad549bd671b5d04ea5936e79e4c4 /util | |
| parent | ab907053bd7b4c5acc1ddb9220a708b9244f7b0f (diff) | |
Update name of c++2a to c++20
Keep the c++2a feature, but make it an alias for compatibility
purposes.
Pick-to: 6.1
Change-Id: I6f153109be84659806f1b7a57a88a187875166d8
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/cmake/configurejson2cmake.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index 1f7d838dc8..160557e18d 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -709,7 +709,7 @@ def write_compile_test( languageStandard = "CXX_STANDARD 14" elif details["qmake"] == "CONFIG += c++11 c++14 c++17": languageStandard = "CXX_STANDARD 17" - elif details["qmake"] == "CONFIG += c++11 c++14 c++17 c++2a": + elif details["qmake"] == "CONFIG += c++11 c++14 c++17 c++20": languageStandard = "CXX_STANDARD 20" elif details["qmake"] == "QMAKE_CXXFLAGS += -fstack-protector-strong": compileOptions = details["qmake"][18:] |