configure: accept -c++std c++17 again

When 2cf66d4 removed support for c++14, it incorrectly also removed support for explicitly setting the default, C++17. This broke build scripts for no good reason, and made it impossible to undo an earlier -c++std c++20 again. Accept C++17 and C++1z again, as an explicit disabler for C++20 and C++23 features. Amends 2cf66d4. Pick-to: 6.8 Fixes: QTBUG-125015 Change-Id: I99b80cd5f41fa5a23259630eae85ef807982f526 Reviewed-by: Joerg Bornemann <[email protected]>
qt · Jun 12, 2024 · 68e6406 · 68e6406
1 parent 962539d
commit 68e6406
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/qt_cmdline.cmake b/qt_cmdline.cmake
@@ -141,7 +141,10 @@ function(qt_commandline_cxxstd arg val nextok)
  qtConfAddError("Missing argument to command line parameter '${arg}'.")
  return()
  endif()
- if(val MATCHES "(c\\+\\+)?(20|2a)")
+ if(val MATCHES "(c\\+\\+)?(17|1z)")
+ qtConfCommandlineDisableFeature(c++20)
+ qtConfCommandlineDisableFeature(c++2b)
+ elseif(val MATCHES "(c\\+\\+)?(20|2a)")
  qtConfCommandlineEnableFeature(c++20)
  qtConfCommandlineDisableFeature(c++2b)
  elseif(val MATCHES "(c\\+\\+)?(2b)")