diff options
Diffstat (limited to 'src/corelib/kernel/qcore_foundation.mm')
| -rw-r--r-- | src/corelib/kernel/qcore_foundation.mm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/kernel/qcore_foundation.mm b/src/corelib/kernel/qcore_foundation.mm index 360b4aebd4..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. @@ -495,9 +495,9 @@ QTimeZone QTimeZone::fromCFTimeZone(CFTimeZoneRef timeZone) CFTimeZoneRef QTimeZone::toCFTimeZone() const { #ifndef QT_NO_DYNAMIC_CAST - Q_ASSERT(dynamic_cast<const QMacTimeZonePrivate *>(d.data())); + Q_ASSERT(dynamic_cast<const QMacTimeZonePrivate *>(d.d)); #endif - const QMacTimeZonePrivate *p = static_cast<const QMacTimeZonePrivate *>(d.data()); + const QMacTimeZonePrivate *p = static_cast<const QMacTimeZonePrivate *>(d.d); return reinterpret_cast<CFTimeZoneRef>([p->nsTimeZone() copy]); } |