From ed98ffb75c9dc54ddc0d1b61fd91bae73de6dc7f Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Tue, 9 Apr 2024 14:33:03 +0200 Subject: [PATCH] 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.5 Task-number: QTBUG-108199 Change-Id: I398cf44c33ffdcb4bb04f54a9d8ccfef68741e4e Reviewed-by: Mate Barany (cherry picked from commit 98581c54fe729f8d30341ebbc0576ad5430df268) --- src/corelib/time/qtimezoneprivate_data_p.h | 1 + src/corelib/time/qtimezoneprivate_p.h | 1 + tests/auto/corelib/time/CMakeLists.txt | 4 +--- tests/auto/corelib/time/qtimezone/tst_qtimezone_darwin.mm | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/corelib/time/qtimezoneprivate_data_p.h b/src/corelib/time/qtimezoneprivate_data_p.h index a4b8868c58d..940346ae99a 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 /* diff --git a/src/corelib/time/qtimezoneprivate_p.h b/src/corelib/time/qtimezoneprivate_p.h index 297e62c7781..fe2bb66630f 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 diff --git a/tests/auto/corelib/time/CMakeLists.txt b/tests/auto/corelib/time/CMakeLists.txt index b593cc54d61..f2dfbfa5275 100644 --- a/tests/auto/corelib/time/CMakeLists.txt +++ b/tests/auto/corelib/time/CMakeLists.txt @@ -6,6 +6,4 @@ add_subdirectory(qdate) add_subdirectory(qdatetime) add_subdirectory(qdatetimeparser) add_subdirectory(qtime) -if(QT_FEATURE_timezone) - add_subdirectory(qtimezone) -endif() +add_subdirectory(qtimezone) diff --git a/tests/auto/corelib/time/qtimezone/tst_qtimezone_darwin.mm b/tests/auto/corelib/time/qtimezone/tst_qtimezone_darwin.mm index 6102fd8a607..f4ef15036df 100644 --- a/tests/auto/corelib/time/qtimezone/tst_qtimezone_darwin.mm +++ b/tests/auto/corelib/time/qtimezone/tst_qtimezone_darwin.mm @@ -9,7 +9,7 @@ void tst_QTimeZone_darwinTypes() { -#if !defined(QT_NO_SYSTEMLOCALE) +#if QT_CONFIG(timezone) // QTimeZone <-> CFTimeZone { QTimeZone qtTimeZone("America/Los_Angeles"); @@ -39,5 +39,5 @@ void tst_QTimeZone_darwinTypes() QVERIFY([qtTimeZone.toNSTimeZone() isEqual:nsTimeZone]); [autoreleasepool release]; } -#endif +#endif // feature timezone }