From 3c412c93c251862a2791557881f9232fd76fda79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Tue, 9 Feb 2021 13:12:09 +0100 Subject: 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 Reviewed-by: Edward Welbourne --- qmake/doc/src/qmake-manual.qdoc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'qmake') diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index d772ba5fc1..d646847217 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -1210,13 +1210,14 @@ \row \li c++14 \li C++14 support is enabled. This option has no effect if the compiler does not support C++14, or can't select the C++ standard. By default, the compiler default is used. - \row \li c++1z \li C++17 support is enabled. This option has no effect if + \row \li c++17 \li C++17 support is enabled. This option has no effect if the compiler does not support C++17, or can't select the C++ standard. By default, support is disabled. - \row \li c++17 \li Same as c++1z. - \row \li c++2a \li C++2a support is enabled. This option has no effect if - the compiler does not support C++2a, or can't select the C++ standard. + \row \li c++1z \li Obsolete alias for c++17. + \row \li c++20 \li C++20 support is enabled. This option has no effect if + the compiler does not support C++20, or can't select the C++ standard. By default, support is disabled. + \row \li c++2a \li Obsolete alias for c++20. \row \li c++latest \li Support for the latest C++ language standard is enabled that is supported by the compiler. By default, this option is disabled. -- cgit v1.2.3