diff options
| author | John Layt <jlayt@kde.org> | 2013-02-04 20:54:29 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-23 01:13:49 +0200 |
| commit | 7ed7d66b5a420f70d056a95a63c9be5de1af3191 (patch) | |
| tree | 13faf2a34f89ecc71a0fac0b629e88fc244fb00e /src/corelib/tools/qtimezone.cpp | |
| parent | 8dfaf910388fc0dd3c53c382e9ff85dd78a9a3ef (diff) | |
QTimeZone - Add Mac backend
Add Mac backend support
Change-Id: Iafa2dbd925e18431f571e3eac62983015f8bc977
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools/qtimezone.cpp')
| -rw-r--r-- | src/corelib/tools/qtimezone.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
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); |