whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure: Fully remove support for -c++std c++14/c++17 

This amends commit 205f8fbff0.

We silently supported the values c++14 and c++17 for the -c++std
argument. Support for both versions of the C++ standard was removed in
above mentioned commit.

Change-Id: I8f7dbc33f0a23164f712ac3d2e0a40bb8d12f225
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
bb10
Joerg Bornemann 2024-03-11 14:00:22 +01:00
parent e10c9b5c0f
commit 2cf66d49ef
1 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
qt_cmdline.cmake
View File

@ -138,29 +138,10 @@ function(qt_commandline_cxxstd arg val nextok)
qtConfAddError("Missing argument to command line parameter '${arg}'.")
return()
endif()
if(val MATCHES "(c\\+\\+)?11")
qtConfCommandlineSetInput(c++14 no)
qtConfCommandlineSetInput(c++17 no)
qtConfCommandlineSetInput(c++20 no)
qtConfCommandlineSetInput(c++2b no)
elseif(val MATCHES "(c\\+\\+)?(14|1y)")
qtConfCommandlineSetInput(c++14 yes)
qtConfCommandlineSetInput(c++17 no)
qtConfCommandlineSetInput(c++20 no)
qtConfCommandlineSetInput(c++2b no)
elseif(val MATCHES "(c\\+\\+)?(17|1z)")
qtConfCommandlineSetInput(c++14 yes)
qtConfCommandlineSetInput(c++17 yes)
qtConfCommandlineSetInput(c++20 no)
qtConfCommandlineSetInput(c++2b no)
elseif(val MATCHES "(c\\+\\+)?(20|2a)")
qtConfCommandlineSetInput(c++14 yes)
qtConfCommandlineSetInput(c++17 yes)
if(val MATCHES "(c\\+\\+)?(20|2a)")
qtConfCommandlineSetInput(c++20 yes)
qtConfCommandlineSetInput(c++2b no)
elseif(val MATCHES "(c\\+\\+)?(2b)")
qtConfCommandlineSetInput(c++14 yes)
qtConfCommandlineSetInput(c++17 yes)
qtConfCommandlineSetInput(c++20 yes)
qtConfCommandlineSetInput(c++2b yes)
else()