From 7ed7d66b5a420f70d056a95a63c9be5de1af3191 Mon Sep 17 00:00:00 2001 From: John Layt Date: Mon, 4 Feb 2013 20:54:29 +0000 Subject: QTimeZone - Add Mac backend Add Mac backend support Change-Id: Iafa2dbd925e18431f571e3eac62983015f8bc977 Reviewed-by: Thiago Macieira --- src/corelib/tools/qtimezone.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/corelib/tools/qtimezone.cpp') diff --git a/src/corelib/tools/qtimezone.cpp b/src/corelib/tools/qtimezone.cpp index 9de9e5de8b..ad13433583 100644 --- a/src/corelib/tools/qtimezone.cpp +++ b/src/corelib/tools/qtimezone.cpp @@ -59,7 +59,9 @@ static QTimeZonePrivate *newBackendTimeZone() return new QUtcTimeZonePrivate(); #endif // QT_USE_ICU #else -#if defined Q_OS_UNIX && !defined Q_OS_MAC +#if defined Q_OS_MAC + return new QMacTimeZonePrivate(); +#elif defined Q_OS_UNIX return new QTzTimeZonePrivate(); #elif defined QT_USE_ICU return new QIcuTimeZonePrivate(); @@ -79,7 +81,9 @@ static QTimeZonePrivate *newBackendTimeZone(const QByteArray &olsenId) return new QUtcTimeZonePrivate(olsenId); #endif // QT_USE_ICU #else -#if defined Q_OS_UNIX && !defined Q_OS_MAC +#if defined Q_OS_MAC + return new QMacTimeZonePrivate(olsenId); +#elif defined Q_OS_UNIX return new QTzTimeZonePrivate(olsenId); #elif defined QT_USE_ICU return new QIcuTimeZonePrivate(olsenId); -- cgit v1.2.3