QTimeZone - Add Mac backend
Add Mac backend support Change-Id: Iafa2dbd925e18431f571e3eac62983015f8bc977 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
John Layt
The Qt Project
parent
8dfaf91038
commit
7ed7d66b5a
@ -59,7 +59,9 @@ static QTimeZonePrivate *newBackendTimeZone()
|
|||||||
return new QUtcTimeZonePrivate();
|
return new QUtcTimeZonePrivate();
|
||||||
#endif // QT_USE_ICU
|
#endif // QT_USE_ICU
|
||||||
#else
|
#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();
|
return new QTzTimeZonePrivate();
|
||||||
#elif defined QT_USE_ICU
|
#elif defined QT_USE_ICU
|
||||||
return new QIcuTimeZonePrivate();
|
return new QIcuTimeZonePrivate();
|
||||||
@ -79,7 +81,9 @@ static QTimeZonePrivate *newBackendTimeZone(const QByteArray &olsenId)
|
|||||||
return new QUtcTimeZonePrivate(olsenId);
|
return new QUtcTimeZonePrivate(olsenId);
|
||||||
#endif // QT_USE_ICU
|
#endif // QT_USE_ICU
|
||||||
#else
|
#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);
|
return new QTzTimeZonePrivate(olsenId);
|
||||||
#elif defined QT_USE_ICU
|
#elif defined QT_USE_ICU
|
||||||
return new QIcuTimeZonePrivate(olsenId);
|
return new QIcuTimeZonePrivate(olsenId);
|
||||||
|
|||||||
260
src/corelib/tools/qtimezoneprivate_mac.mm
Normal file
260
src/corelib/tools/qtimezoneprivate_mac.mm
Normal file
@ -0,0 +1,260 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
**
|
||||||
|
** Copyright (C) 2013 John Layt <jlayt@kde.org>
|
||||||
|
** Contact: http://www.qt-project.org/legal
|
||||||
|
**
|
||||||
|
** This file is part of the QtCore module of the Qt Toolkit.
|
||||||
|
**
|
||||||
|
** $QT_BEGIN_LICENSE:LGPL$
|
||||||
|
** Commercial License Usage
|
||||||
|
** Licensees holding valid commercial Qt licenses may use this file in
|
||||||
|
** accordance with the commercial license agreement provided with the
|
||||||
|
** Software or, alternatively, in accordance with the terms contained in
|
||||||
|
** a written agreement between you and Digia. For licensing terms and
|
||||||
|
** conditions see http://qt.digia.com/licensing. For further information
|
||||||
|
** use the contact form at http://qt.digia.com/contact-us.
|
||||||
|
**
|
||||||
|
** GNU Lesser General Public License Usage
|
||||||
|
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||||
|
** General Public License version 2.1 as published by the Free Software
|
||||||
|
** Foundation and appearing in the file LICENSE.LGPL included in the
|
||||||
|
** packaging of this file. Please review the following information to
|
||||||
|
** ensure the GNU Lesser General Public License version 2.1 requirements
|
||||||
|
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||||
|
**
|
||||||
|
** In addition, as a special exception, Digia gives you certain additional
|
||||||
|
** rights. These rights are described in the Digia Qt LGPL Exception
|
||||||
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||||
|
**
|
||||||
|
** GNU General Public License Usage
|
||||||
|
** Alternatively, this file may be used under the terms of the GNU
|
||||||
|
** General Public License version 3.0 as published by the Free Software
|
||||||
|
** Foundation and appearing in the file LICENSE.GPL included in the
|
||||||
|
** packaging of this file. Please review the following information to
|
||||||
|
** ensure the GNU General Public License version 3.0 requirements will be
|
||||||
|
** met: http://www.gnu.org/copyleft/gpl.html.
|
||||||
|
**
|
||||||
|
**
|
||||||
|
** $QT_END_LICENSE$
|
||||||
|
**
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
#include "qtimezone.h"
|
||||||
|
#include "qtimezoneprivate_p.h"
|
||||||
|
|
||||||
|
#include "private/qcore_mac_p.h"
|
||||||
|
#include "qstringlist.h"
|
||||||
|
|
||||||
|
#include <Foundation/NSTimeZone.h>
|
||||||
|
|
||||||
|
#include <qdebug.h>
|
||||||
|
|
||||||
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
|
/*
|
||||||
|
Private
|
||||||
|
|
||||||
|
OS X system implementation
|
||||||
|
*/
|
||||||
|
|
||||||
|
// Create the system default time zone
|
||||||
|
QMacTimeZonePrivate::QMacTimeZonePrivate()
|
||||||
|
{
|
||||||
|
init(systemTimeZoneId());
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create a named time zone
|
||||||
|
QMacTimeZonePrivate::QMacTimeZonePrivate(const QByteArray &olsenId)
|
||||||
|
: m_nstz(0)
|
||||||
|
{
|
||||||
|
init(olsenId);
|
||||||
|
}
|
||||||
|
|
||||||
|
QMacTimeZonePrivate::QMacTimeZonePrivate(const QMacTimeZonePrivate &other)
|
||||||
|
: QTimeZonePrivate(other), m_nstz(0)
|
||||||
|
{
|
||||||
|
m_nstz = [other.m_nstz copy];
|
||||||
|
}
|
||||||
|
|
||||||
|
QMacTimeZonePrivate::~QMacTimeZonePrivate()
|
||||||
|
{
|
||||||
|
[m_nstz release];
|
||||||
|
}
|
||||||
|
|
||||||
|
QTimeZonePrivate *QMacTimeZonePrivate::clone()
|
||||||
|
{
|
||||||
|
return new QMacTimeZonePrivate(*this);
|
||||||
|
}
|
||||||
|
|
||||||
|
void QMacTimeZonePrivate::init(const QByteArray &olsenId)
|
||||||
|
{
|
||||||
|
if (availableTimeZoneIds().contains(olsenId)) {
|
||||||
|
m_nstz = [NSTimeZone timeZoneWithName:QCFString::toNSString(QString::fromUtf8(olsenId))];
|
||||||
|
if (m_nstz)
|
||||||
|
m_id = olsenId;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QString QMacTimeZonePrivate::comment() const
|
||||||
|
{
|
||||||
|
return QCFString::toQString([m_nstz description]);
|
||||||
|
}
|
||||||
|
|
||||||
|
QString QMacTimeZonePrivate::displayName(QTimeZone::TimeType timeType,
|
||||||
|
QTimeZone::NameType nameType,
|
||||||
|
const QLocale &locale) const
|
||||||
|
{
|
||||||
|
// TODO Mac doesn't support OffsetName yet so use standard offset name
|
||||||
|
if (nameType == QTimeZone::OffsetName) {
|
||||||
|
const Data nowData = data(QDateTime::currentDateTimeUtc().toMSecsSinceEpoch());
|
||||||
|
// TODO Cheat for now, assume if has dst the offset if 1 hour
|
||||||
|
if (timeType == QTimeZone::DaylightTime && hasDaylightTime())
|
||||||
|
return isoOffsetFormat(nowData.standardTimeOffset + 3600);
|
||||||
|
else
|
||||||
|
return isoOffsetFormat(nowData.standardTimeOffset);
|
||||||
|
}
|
||||||
|
|
||||||
|
NSTimeZoneNameStyle style = NSTimeZoneNameStyleStandard;
|
||||||
|
|
||||||
|
switch (nameType) {
|
||||||
|
case QTimeZone::ShortName :
|
||||||
|
if (timeType == QTimeZone::DaylightTime)
|
||||||
|
style = NSTimeZoneNameStyleShortDaylightSaving;
|
||||||
|
else if (timeType == QTimeZone::GenericTime)
|
||||||
|
style = NSTimeZoneNameStyleShortGeneric;
|
||||||
|
else
|
||||||
|
style = NSTimeZoneNameStyleShortStandard;
|
||||||
|
break;
|
||||||
|
case QTimeZone::DefaultName :
|
||||||
|
case QTimeZone::LongName :
|
||||||
|
if (timeType == QTimeZone::DaylightTime)
|
||||||
|
style = NSTimeZoneNameStyleDaylightSaving;
|
||||||
|
else if (timeType == QTimeZone::GenericTime)
|
||||||
|
style = NSTimeZoneNameStyleGeneric;
|
||||||
|
else
|
||||||
|
style = NSTimeZoneNameStyleStandard;
|
||||||
|
break;
|
||||||
|
case QTimeZone::OffsetName :
|
||||||
|
// Unreachable
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
NSString *macLocaleCode = QCFString::toNSString(locale.name());
|
||||||
|
NSLocale *macLocale = [[NSLocale alloc] initWithLocaleIdentifier:macLocaleCode];
|
||||||
|
const QString result = QCFString::toQString([m_nstz localizedName:style locale:macLocale]);
|
||||||
|
[macLocaleCode release];
|
||||||
|
[macLocale release];
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
QString QMacTimeZonePrivate::abbreviation(qint64 atMSecsSinceEpoch) const
|
||||||
|
{
|
||||||
|
const NSTimeInterval seconds = atMSecsSinceEpoch / 1000.0;
|
||||||
|
return QCFString::toQString([m_nstz abbreviationForDate:[NSDate dateWithTimeIntervalSince1970:seconds]]);
|
||||||
|
}
|
||||||
|
|
||||||
|
int QMacTimeZonePrivate::offsetFromUtc(qint64 atMSecsSinceEpoch) const
|
||||||
|
{
|
||||||
|
const NSTimeInterval seconds = atMSecsSinceEpoch / 1000.0;
|
||||||
|
return [m_nstz secondsFromGMTForDate:[NSDate dateWithTimeIntervalSince1970:seconds]];
|
||||||
|
}
|
||||||
|
|
||||||
|
int QMacTimeZonePrivate::standardTimeOffset(qint64 atMSecsSinceEpoch) const
|
||||||
|
{
|
||||||
|
return offsetFromUtc(atMSecsSinceEpoch) - daylightTimeOffset(atMSecsSinceEpoch);
|
||||||
|
}
|
||||||
|
|
||||||
|
int QMacTimeZonePrivate::daylightTimeOffset(qint64 atMSecsSinceEpoch) const
|
||||||
|
{
|
||||||
|
const NSTimeInterval seconds = atMSecsSinceEpoch / 1000.0;
|
||||||
|
return [m_nstz daylightSavingTimeOffsetForDate:[NSDate dateWithTimeIntervalSince1970:seconds]];
|
||||||
|
}
|
||||||
|
|
||||||
|
bool QMacTimeZonePrivate::hasDaylightTime() const
|
||||||
|
{
|
||||||
|
// TODO No Mac API, assume if has transitions
|
||||||
|
return hasTransitions();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool QMacTimeZonePrivate::isDaylightTime(qint64 atMSecsSinceEpoch) const
|
||||||
|
{
|
||||||
|
const NSTimeInterval seconds = atMSecsSinceEpoch / 1000.0;
|
||||||
|
return [m_nstz isDaylightSavingTimeForDate:[NSDate dateWithTimeIntervalSince1970:seconds]];
|
||||||
|
}
|
||||||
|
|
||||||
|
QTimeZonePrivate::Data QMacTimeZonePrivate::data(qint64 forMSecsSinceEpoch) const
|
||||||
|
{
|
||||||
|
const NSTimeInterval seconds = forMSecsSinceEpoch / 1000.0;
|
||||||
|
Data data;
|
||||||
|
data.atMSecsSinceEpoch = forMSecsSinceEpoch;
|
||||||
|
data.offsetFromUtc = [m_nstz secondsFromGMTForDate:
|
||||||
|
[NSDate dateWithTimeIntervalSince1970:seconds]];
|
||||||
|
data.daylightTimeOffset = [m_nstz daylightSavingTimeOffsetForDate:
|
||||||
|
[NSDate dateWithTimeIntervalSince1970:seconds]];
|
||||||
|
data.standardTimeOffset = data.offsetFromUtc - data.daylightTimeOffset;
|
||||||
|
data.abbreviation = QCFString::toQString([m_nstz abbreviationForDate:
|
||||||
|
[NSDate dateWithTimeIntervalSince1970:seconds]]);
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool QMacTimeZonePrivate::hasTransitions() const
|
||||||
|
{
|
||||||
|
// TODO No direct Mac API, so return if has next after 1970, i.e. since start of tz
|
||||||
|
// TODO Not sure what is returned in event of no transitions, assume will be before requested date
|
||||||
|
NSDate *epoch = [NSDate dateWithTimeIntervalSince1970:0];
|
||||||
|
const NSDate *date = [m_nstz nextDaylightSavingTimeTransitionAfterDate:epoch];
|
||||||
|
const bool result = ([date timeIntervalSince1970] > [epoch timeIntervalSince1970]);
|
||||||
|
[epoch release];
|
||||||
|
[date release];
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
QTimeZonePrivate::Data QMacTimeZonePrivate::nextTransition(qint64 afterMSecsSinceEpoch) const
|
||||||
|
{
|
||||||
|
QTimeZonePrivate::Data tran;
|
||||||
|
const NSTimeInterval seconds = afterMSecsSinceEpoch / 1000.0;
|
||||||
|
NSDate *date = [NSDate dateWithTimeIntervalSince1970:seconds];
|
||||||
|
const NSDate *next = [m_nstz nextDaylightSavingTimeTransitionAfterDate:date];
|
||||||
|
const NSTimeInterval nextSecs = [next timeIntervalSince1970];
|
||||||
|
tran.atMSecsSinceEpoch = nextSecs * 1000;
|
||||||
|
tran.offsetFromUtc = [m_nstz secondsFromGMTForDate:
|
||||||
|
[NSDate dateWithTimeIntervalSince1970:nextSecs]];
|
||||||
|
tran.daylightTimeOffset = [m_nstz daylightSavingTimeOffsetForDate:
|
||||||
|
[NSDate dateWithTimeIntervalSince1970:nextSecs]];
|
||||||
|
tran.standardTimeOffset = tran.offsetFromUtc - tran.daylightTimeOffset;
|
||||||
|
tran.abbreviation = QCFString::toQString([m_nstz abbreviationForDate:date]);
|
||||||
|
[next release];
|
||||||
|
[date release];
|
||||||
|
return tran;
|
||||||
|
}
|
||||||
|
|
||||||
|
QTimeZonePrivate::Data QMacTimeZonePrivate::previousTransition(qint64 beforeMSecsSinceEpoch) const
|
||||||
|
{
|
||||||
|
// TODO No direct Mac API, so get all transitions since epoch and return the last one
|
||||||
|
// Probably slow, need to optimize
|
||||||
|
return transitions(0, beforeMSecsSinceEpoch - 1).last();
|
||||||
|
}
|
||||||
|
|
||||||
|
QByteArray QMacTimeZonePrivate::systemTimeZoneId() const
|
||||||
|
{
|
||||||
|
// Reset the cached system tz then return the name
|
||||||
|
[NSTimeZone resetSystemTimeZone];
|
||||||
|
return QCFString::toQString([[NSTimeZone systemTimeZone] name]).toUtf8();
|
||||||
|
}
|
||||||
|
|
||||||
|
QSet<QByteArray> QMacTimeZonePrivate::availableTimeZoneIds() const
|
||||||
|
{
|
||||||
|
NSEnumerator *enumerator = [[NSTimeZone knownTimeZoneNames] objectEnumerator];
|
||||||
|
QByteArray tzid = QCFString::toQString([enumerator nextObject]).toUtf8();
|
||||||
|
|
||||||
|
QSet<QByteArray> set;
|
||||||
|
while (!tzid.isEmpty()) {
|
||||||
|
set << tzid;
|
||||||
|
tzid = QCFString::toQString([enumerator nextObject]).toUtf8();
|
||||||
|
}
|
||||||
|
|
||||||
|
[enumerator release];
|
||||||
|
return set;
|
||||||
|
}
|
||||||
|
|
||||||
|
QT_END_NAMESPACE
|
||||||
@ -61,6 +61,14 @@
|
|||||||
#include <unicode/ucal.h>
|
#include <unicode/ucal.h>
|
||||||
#endif // QT_USE_ICU
|
#endif // QT_USE_ICU
|
||||||
|
|
||||||
|
#ifdef Q_OS_MAC
|
||||||
|
#ifdef __OBJC__
|
||||||
|
@class NSTimeZone;
|
||||||
|
#else
|
||||||
|
class NSTimeZone;
|
||||||
|
#endif // __OBJC__
|
||||||
|
#endif // Q_OS_MAC
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
class Q_CORE_EXPORT QTimeZonePrivate : public QSharedData
|
class Q_CORE_EXPORT QTimeZonePrivate : public QSharedData
|
||||||
@ -306,6 +314,49 @@ private:
|
|||||||
};
|
};
|
||||||
#endif // Q_OS_UNIX
|
#endif // Q_OS_UNIX
|
||||||
|
|
||||||
|
#ifdef Q_OS_MAC
|
||||||
|
class Q_AUTOTEST_EXPORT QMacTimeZonePrivate Q_DECL_FINAL : public QTimeZonePrivate
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
// Create default time zone
|
||||||
|
QMacTimeZonePrivate();
|
||||||
|
// Create named time zone
|
||||||
|
QMacTimeZonePrivate(const QByteArray &olsenId);
|
||||||
|
QMacTimeZonePrivate(const QMacTimeZonePrivate &other);
|
||||||
|
~QMacTimeZonePrivate();
|
||||||
|
|
||||||
|
QTimeZonePrivate *clone();
|
||||||
|
|
||||||
|
QString comment() const Q_DECL_OVERRIDE;
|
||||||
|
|
||||||
|
QString displayName(QTimeZone::TimeType timeType, QTimeZone::NameType nameType,
|
||||||
|
const QLocale &locale) const Q_DECL_OVERRIDE;
|
||||||
|
QString abbreviation(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE;
|
||||||
|
|
||||||
|
int offsetFromUtc(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE;
|
||||||
|
int standardTimeOffset(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE;
|
||||||
|
int daylightTimeOffset(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE;
|
||||||
|
|
||||||
|
bool hasDaylightTime() const Q_DECL_OVERRIDE;
|
||||||
|
bool isDaylightTime(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE;
|
||||||
|
|
||||||
|
Data data(qint64 forMSecsSinceEpoch) const Q_DECL_OVERRIDE;
|
||||||
|
|
||||||
|
bool hasTransitions() const Q_DECL_OVERRIDE;
|
||||||
|
Data nextTransition(qint64 afterMSecsSinceEpoch) const Q_DECL_OVERRIDE;
|
||||||
|
Data previousTransition(qint64 beforeMSecsSinceEpoch) const Q_DECL_OVERRIDE;
|
||||||
|
|
||||||
|
QByteArray systemTimeZoneId() const Q_DECL_OVERRIDE;
|
||||||
|
|
||||||
|
QSet<QByteArray> availableTimeZoneIds() const Q_DECL_OVERRIDE;
|
||||||
|
|
||||||
|
private:
|
||||||
|
void init(const QByteArray &zoneId);
|
||||||
|
|
||||||
|
NSTimeZone *m_nstz;
|
||||||
|
};
|
||||||
|
#endif // Q_OS_MAC
|
||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
#endif // QTIMEZONEPRIVATE_P_H
|
#endif // QTIMEZONEPRIVATE_P_H
|
||||||
|
|||||||
@ -116,6 +116,7 @@ SOURCES += \
|
|||||||
!nacl:mac: {
|
!nacl:mac: {
|
||||||
SOURCES += tools/qelapsedtimer_mac.cpp
|
SOURCES += tools/qelapsedtimer_mac.cpp
|
||||||
OBJECTIVE_SOURCES += tools/qlocale_mac.mm \
|
OBJECTIVE_SOURCES += tools/qlocale_mac.mm \
|
||||||
|
tools/qtimezoneprivate_mac.mm \
|
||||||
tools/qstring_mac.mm
|
tools/qstring_mac.mm
|
||||||
}
|
}
|
||||||
else:blackberry {
|
else:blackberry {
|
||||||
|
|||||||
@ -62,6 +62,7 @@ private slots:
|
|||||||
void utcTest();
|
void utcTest();
|
||||||
void icuTest();
|
void icuTest();
|
||||||
void tzTest();
|
void tzTest();
|
||||||
|
void macTest();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void printTimeZone(const QTimeZone tz);
|
void printTimeZone(const QTimeZone tz);
|
||||||
@ -690,6 +691,55 @@ void tst_QTimeZone::tzTest()
|
|||||||
#endif // Q_OS_UNIX
|
#endif // Q_OS_UNIX
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void tst_QTimeZone::macTest()
|
||||||
|
{
|
||||||
|
#if defined(QT_BUILD_INTERNAL) && defined (Q_OS_MAC)
|
||||||
|
// Known datetimes
|
||||||
|
qint64 std = QDateTime(QDate(2012, 1, 1), QTime(0, 0, 0), Qt::UTC).toMSecsSinceEpoch();
|
||||||
|
qint64 dst = QDateTime(QDate(2012, 6, 1), QTime(0, 0, 0), Qt::UTC).toMSecsSinceEpoch();
|
||||||
|
|
||||||
|
// Test default constructor
|
||||||
|
QMacTimeZonePrivate tzpd;
|
||||||
|
QVERIFY(tzpd.isValid());
|
||||||
|
|
||||||
|
// Test invalid constructor
|
||||||
|
QMacTimeZonePrivate tzpi("Gondwana/Erewhon");
|
||||||
|
QCOMPARE(tzpi.isValid(), false);
|
||||||
|
|
||||||
|
// Test named constructor
|
||||||
|
QMacTimeZonePrivate tzp("Europe/Berlin");
|
||||||
|
QVERIFY(tzp.isValid());
|
||||||
|
|
||||||
|
// Test display names by type
|
||||||
|
QLocale enUS("en_US");
|
||||||
|
QCOMPARE(tzp.displayName(QTimeZone::StandardTime, QTimeZone::LongName, enUS),
|
||||||
|
QString("Central European Standard Time"));
|
||||||
|
QCOMPARE(tzp.displayName(QTimeZone::StandardTime, QTimeZone::ShortName, enUS),
|
||||||
|
QString("GMT+01:00"));
|
||||||
|
QCOMPARE(tzp.displayName(QTimeZone::StandardTime, QTimeZone::OffsetName, enUS),
|
||||||
|
QString("UTC+01:00"));
|
||||||
|
QCOMPARE(tzp.displayName(QTimeZone::DaylightTime, QTimeZone::LongName, enUS),
|
||||||
|
QString("Central European Summer Time"));
|
||||||
|
QCOMPARE(tzp.displayName(QTimeZone::DaylightTime, QTimeZone::ShortName, enUS),
|
||||||
|
QString("GMT+02:00"));
|
||||||
|
QCOMPARE(tzp.displayName(QTimeZone::DaylightTime, QTimeZone::OffsetName, enUS),
|
||||||
|
QString("UTC+02:00"));
|
||||||
|
// ICU C api does not support Generic Time yet, C++ api does
|
||||||
|
QCOMPARE(tzp.displayName(QTimeZone::GenericTime, QTimeZone::LongName, enUS),
|
||||||
|
QString("Central European Time"));
|
||||||
|
QCOMPARE(tzp.displayName(QTimeZone::GenericTime, QTimeZone::ShortName, enUS),
|
||||||
|
QString("Germany Time"));
|
||||||
|
QCOMPARE(tzp.displayName(QTimeZone::GenericTime, QTimeZone::OffsetName, enUS),
|
||||||
|
QString("UTC+01:00"));
|
||||||
|
|
||||||
|
// Test Abbreviations
|
||||||
|
QCOMPARE(tzp.abbreviation(std), QString("CET"));
|
||||||
|
QCOMPARE(tzp.abbreviation(dst), QString("CEST"));
|
||||||
|
|
||||||
|
testCetPrivate(tzp);
|
||||||
|
#endif // Q_OS_MAC
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef QT_BUILD_INTERNAL
|
#ifdef QT_BUILD_INTERNAL
|
||||||
// Test each private produces the same basic results for CET
|
// Test each private produces the same basic results for CET
|
||||||
void tst_QTimeZone::testCetPrivate(const QTimeZonePrivate &tzp)
|
void tst_QTimeZone::testCetPrivate(const QTimeZonePrivate &tzp)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user