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 /cmake | |
| 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 'cmake')
| -rw-r--r-- | cmake/QtFlagHandlingHelpers.cmake | 2 | ||||
| -rw-r--r-- | cmake/configure-cmake-mapping.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmake/QtFlagHandlingHelpers.cmake b/cmake/QtFlagHandlingHelpers.cmake index 69558c32db..9af05d5907 100644 --- a/cmake/QtFlagHandlingHelpers.cmake +++ b/cmake/QtFlagHandlingHelpers.cmake @@ -216,7 +216,7 @@ endfunction() function(qt_set_language_standards) ## Use the latest standard the compiler supports (same as qt_common.prf) - if (QT_FEATURE_cxx2a) + if (QT_FEATURE_cxx20) set(CMAKE_CXX_STANDARD 20 PARENT_SCOPE) else() set(CMAKE_CXX_STANDARD 17 PARENT_SCOPE) diff --git a/cmake/configure-cmake-mapping.md b/cmake/configure-cmake-mapping.md index 99bce46a3d..f9a71b59d5 100644 --- a/cmake/configure-cmake-mapping.md +++ b/cmake/configure-cmake-mapping.md @@ -56,7 +56,7 @@ The effort of this is tracked in QTBUG-85373 and QTBUG-85349. | | or -DFEATURE_<backend> | | | -sanitize address -sanitize undefined | -DECM_ENABLE_SANITIZERS=address;undefined | | | -coverage <arg> | | | -| -c++std c++2a | -DFEATURE_cxx2a=ON | | +| -c++std c++20 | -DFEATURE_cxx20=ON | | | -sse2/-sse3/-ssse3/-sse4.1 | -DFEATURE_sse4=ON | | | -mips_dsp/-mips_dspr2 | -DFEATURE_mips_dsp=ON | | | -qreal <type> | -DQT_COORD_TYPE=<type> | | |