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 /qt_cmdline.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 'qt_cmdline.cmake')
-rw-r--r-- | qt_cmdline.cmake | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/qt_cmdline.cmake b/qt_cmdline.cmake index 0145cd4a14..10cc67d7ec 100644 --- a/qt_cmdline.cmake +++ b/qt_cmdline.cmake @@ -152,20 +152,20 @@ function(qt_commandline_cxxstd arg val nextok) endif() if(val MATCHES "(c\\+\\+)?11") qtConfCommandlineSetInput(c++14 no) - qtConfCommandlineSetInput(c++1z no) - qtConfCommandlineSetInput(c++2a no) + qtConfCommandlineSetInput(c++17 no) + qtConfCommandlineSetInput(c++20 no) elseif(val MATCHES "(c\\+\\+)?(14|1y)") qtConfCommandlineSetInput(c++14 yes) - qtConfCommandlineSetInput(c++1z no) - qtConfCommandlineSetInput(c++2a no) + qtConfCommandlineSetInput(c++17 no) + qtConfCommandlineSetInput(c++20 no) elseif(val MATCHES "(c\\+\\+)?(17|1z)") qtConfCommandlineSetInput(c++14 yes) - qtConfCommandlineSetInput(c++1z yes) - qtConfCommandlineSetInput(c++2a no) - elseif(val MATCHES "(c\\+\\+)?2a") + qtConfCommandlineSetInput(c++17 yes) + qtConfCommandlineSetInput(c++20 no) + elseif(val MATCHES "(c\\+\\+)?(20|2a)") qtConfCommandlineSetInput(c++14 yes) - qtConfCommandlineSetInput(c++1z yes) - qtConfCommandlineSetInput(c++2a yes) + qtConfCommandlineSetInput(c++17 yes) + qtConfCommandlineSetInput(c++20 yes) else() qtConfAddError("Invalid argument '${val}' to command line parameter '${arg}'") endif() |