From 56d8a751cb6c489f623634b72fd89ffbf55c1c1b Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Fri, 2 Feb 2024 09:54:13 +0100 Subject: [PATCH] Unify the CMake config for QTZP_icu.cpp The two differed only in one selecting UNIX, the other WIN32; not sure we have any platforms for which neither of those conditions is true but, in any case, if such a platform has ICU and enables feature timezone, I guess we should be using ICU for its timezone backend. Change-Id: I3a7812c143f18732bf4dae7e8de8e42a662f0f39 Reviewed-by: Alexey Edelev Reviewed-by: Thiago Macieira --- src/corelib/CMakeLists.txt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index a6bc1ee71eb..386be820109 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -898,12 +898,9 @@ qt_internal_extend_target(Core CONDITION QT_FEATURE_timezone AND UNIX AND NOT AN time/qtimezoneprivate_tz.cpp ) -qt_internal_extend_target(Core CONDITION QT_FEATURE_icu AND QT_FEATURE_timezone AND UNIX AND NOT ANDROID AND NOT APPLE - SOURCES - time/qtimezoneprivate_icu.cpp -) - -qt_internal_extend_target(Core CONDITION QT_FEATURE_icu AND QT_FEATURE_timezone AND WIN32 AND NOT ANDROID AND NOT APPLE +qt_internal_extend_target(Core + CONDITION + QT_FEATURE_icu AND QT_FEATURE_timezone AND NOT ANDROID AND NOT APPLE SOURCES time/qtimezoneprivate_icu.cpp )