From 0f985e16ba741695182020f2c6a952f31e44c722 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Wed, 19 Jul 2023 15:19:00 +0200 Subject: [PATCH] headersclean: Simplify logic for gcc only options Oldest GCC version we nowadays support is GCC 9. Change-Id: If35ef1aa7bf63da55404832107226e1fa139723e Reviewed-by: Alexey Edelev Reviewed-by: Qt CI Bot --- cmake/QtHeadersClean.cmake | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/cmake/QtHeadersClean.cmake b/cmake/QtHeadersClean.cmake index 9082f258d87..4ae076413d5 100644 --- a/cmake/QtHeadersClean.cmake +++ b/cmake/QtHeadersClean.cmake @@ -121,13 +121,7 @@ function(qt_internal_add_headersclean_target module_target module_headers) endif() if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - list(APPEND hcleanFLAGS -Wzero-as-null-pointer-constant) - if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 4.5) - list(APPEND hcleanFLAGS -Wdouble-promotion) - endif() - if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 4.9) - list(APPEND hcleanFLAGS -Wfloat-conversion) - endif() + list(APPEND hcleanFLAGS -Wdouble-promotion -Wfloat-conversion) endif() if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang|IntelLLVM")