diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2024-01-29 14:50:40 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2024-02-01 21:50:50 +0100 |
| commit | 62b3720a207ef0c6cfafaa0ecc26dd3cbbf400d0 (patch) | |
| tree | d9f3da92e77fe16102e83b63d66bb6aa651aaef5 /src/corelib/kernel | |
| parent | c23d3ca1f08a7c7c76bb71602a56a79898efa117 (diff) | |
Remove system locale dependency from timezone code that doesn't need it
Various parts of QTimeZone's code were, for no immediately apparent
reason, conditioned on !defined(QT_NO_SYSTEMLOCALE). All are in any
case conditioned on feature timezone; and none had any obvious
relationship with QLocale::system(). Assume this is a fossil left over
from initial development of timezone support and purge.
[ChangeLog][QtCore][QTimeZone] Some features are now available
whenever feature timezone is enabled, that were previously dependent
on system locale support.
Change-Id: I7f2246e17ace22d2aecc9286295ae522ee2a0f5f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qcore_foundation.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qcore_foundation.mm b/src/corelib/kernel/qcore_foundation.mm index cf15e24917..a31040944f 100644 --- a/src/corelib/kernel/qcore_foundation.mm +++ b/src/corelib/kernel/qcore_foundation.mm @@ -10,7 +10,7 @@ #include <QtCore/qbytearray.h> #include <QtCore/qrect.h> -#if QT_CONFIG(timezone) && !defined(QT_NO_SYSTEMLOCALE) +#if QT_CONFIG(timezone) #include <QtCore/qtimezone.h> #include <QtCore/private/qtimezoneprivate_p.h> #include <QtCore/private/qcore_mac_p.h> @@ -466,7 +466,7 @@ NSDate *QDateTime::toNSDate() const // ---------------------------------------------------------------------------- -#if QT_CONFIG(timezone) && !defined(QT_NO_SYSTEMLOCALE) +#if QT_CONFIG(timezone) /*! \brief Constructs a new QTimeZone containing a copy of the CFTimeZone \a timeZone. |