From edc3feb07b0dd145fea008c24d2768ff5ca1d384 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 26 Feb 2024 15:54:59 +0100 Subject: [PATCH] Clean up conditioning on use of MS backend for timezones CONDITION can be split across lines, so doen't need to overflow our usual right margin and can be more readable. WIN32 in fact implies NOT ANDROID AND NOT APPLE, so don't bother repeating those. Change-Id: I03b649d4588f7f84b08b41028dd08941100b749e Reviewed-by: Alexey Edelev --- src/corelib/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index b2b80e1fca3..fa180109650 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -913,7 +913,10 @@ qt_internal_extend_target(Core time/qtimezoneprivate_icu.cpp ) -qt_internal_extend_target(Core CONDITION QT_FEATURE_timezone AND WIN32 AND NOT QT_FEATURE_icu AND NOT ANDROID AND NOT APPLE +# Even MS says we should prefer ICU over its APIs for TZ data: +qt_internal_extend_target(Core + CONDITION + QT_FEATURE_timezone AND WIN32 AND NOT QT_FEATURE_icu SOURCES time/qtimezoneprivate_win.cpp )