From 98581c54fe729f8d30341ebbc0576ad5430df268 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Tue, 9 Apr 2024 14:33:03 +0200 Subject: More consistent handling of feature timezone Follow-up to commit ae6186c7e8cfdb9420b9119f5affbba7d069598d * require the feature in headers that should only be seen when it's enabled, * expose the auto-test to being run even when the feature is disabled (the parts of that depend on the feature have needed #if-ery) and * fix the Darwin-specific test's misguided #if-ery. Pick-to: 6.7 6.5 Task-number: QTBUG-108199 Change-Id: I398cf44c33ffdcb4bb04f54a9d8ccfef68741e4e Reviewed-by: Mate Barany --- src/corelib/time/qtimezonelocale_p.h | 1 + src/corelib/time/qtimezoneprivate_data_p.h | 1 + src/corelib/time/qtimezoneprivate_p.h | 1 + 3 files changed, 3 insertions(+) (limited to 'src') diff --git a/src/corelib/time/qtimezonelocale_p.h b/src/corelib/time/qtimezonelocale_p.h index 2b2c4451d8..adc8e83b35 100644 --- a/src/corelib/time/qtimezonelocale_p.h +++ b/src/corelib/time/qtimezonelocale_p.h @@ -17,6 +17,7 @@ #include +QT_REQUIRE_CONFIG(timezone); QT_REQUIRE_CONFIG(timezone_locale); namespace QtTimeZoneLocale { diff --git a/src/corelib/time/qtimezoneprivate_data_p.h b/src/corelib/time/qtimezoneprivate_data_p.h index 98b55df10b..659605b224 100644 --- a/src/corelib/time/qtimezoneprivate_data_p.h +++ b/src/corelib/time/qtimezoneprivate_data_p.h @@ -20,6 +20,7 @@ #include "qbytearrayview.h" #include "qstring.h" +QT_REQUIRE_CONFIG(timezone); QT_BEGIN_NAMESPACE namespace QtTimeZoneCldr { diff --git a/src/corelib/time/qtimezoneprivate_p.h b/src/corelib/time/qtimezoneprivate_p.h index 0f006a7896..3aa3658c14 100644 --- a/src/corelib/time/qtimezoneprivate_p.h +++ b/src/corelib/time/qtimezoneprivate_p.h @@ -38,6 +38,7 @@ Q_FORWARD_DECLARE_OBJC_CLASS(NSTimeZone); #include #endif +QT_REQUIRE_CONFIG(timezone); QT_BEGIN_NAMESPACE class Q_AUTOTEST_EXPORT QTimeZonePrivate : public QSharedData -- cgit v1.2.3