diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2024-04-09 14:33:03 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2024-04-19 13:56:35 +0200 |
| commit | 98581c54fe729f8d30341ebbc0576ad5430df268 (patch) | |
| tree | d7c4c7b884e228346e3d92a6027b96fdbfcdb370 | |
| parent | a256e574f100a5eef046b8ac4b5aa38e6860a4cd (diff) | |
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 <mate.barany@qt.io>
| -rw-r--r-- | src/corelib/time/qtimezonelocale_p.h | 1 | ||||
| -rw-r--r-- | src/corelib/time/qtimezoneprivate_data_p.h | 1 | ||||
| -rw-r--r-- | src/corelib/time/qtimezoneprivate_p.h | 1 | ||||
| -rw-r--r-- | tests/auto/corelib/time/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/auto/corelib/time/qtimezone/tst_qtimezone_darwin.mm | 4 |
5 files changed, 6 insertions, 5 deletions
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 <QtCore/qtimezone.h> +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 <QJniObject> #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 b593cc54d6..f2dfbfa527 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 6102fd8a60..f4ef15036d 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 } |