From d1cca1d205ebdf22aa108ccad0c4c1420b6d1533 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Wed, 28 Feb 2024 00:12:31 +0100 Subject: [PATCH] CMake: remove a duplicate check for C++2b Change-Id: Ie617fa277fc3a36b5e2f34ae1b79099193ae1b17 Reviewed-by: Joerg Bornemann (cherry picked from commit 918ac58a89b17a73a73bb15055d97f6eee782051) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 80a3175a28612ddaac2d746a45b180db1776541c) --- configure.cmake | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/configure.cmake b/configure.cmake index 2819dd49866..e4904115847 100644 --- a/configure.cmake +++ b/configure.cmake @@ -637,13 +637,9 @@ qt_feature_config("c++2a" QMAKE_PUBLIC_QT_CONFIG) qt_feature("c++2b" PUBLIC LABEL "C++2b" AUTODETECT OFF -) -qt_feature_config("c++2b" QMAKE_PUBLIC_QT_CONFIG) -qt_feature("c++2b" PUBLIC - LABEL "C++2b" - AUTODETECT FALSE CONDITION QT_FEATURE_cxx20 AND (CMAKE_VERSION VERSION_GREATER_EQUAL "3.20") AND TEST_cxx2b ) +qt_feature_config("c++2b" QMAKE_PUBLIC_QT_CONFIG) qt_feature("precompile_header" LABEL "Using precompiled headers" CONDITION BUILD_WITH_PCH AND TEST_precompile_header