diff --git a/qt_cmdline.cmake b/qt_cmdline.cmake index 14df26e0a26..fdf22561e7b 100644 --- a/qt_cmdline.cmake +++ b/qt_cmdline.cmake @@ -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()