From 2cf66d49ef926ee53b6c394d8be0b8e8bcf148e8 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 11 Mar 2024 14:00:22 +0100 Subject: [PATCH] configure: Fully remove support for -c++std c++14/c++17 This amends commit 205f8fbff0708ee0425fcf1f300edca4f14da6cc. 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 --- qt_cmdline.cmake | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) 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()