whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fix time-zone tests on macOS >= 10.13, which now knows what CET is" 

This reverts commit fd38c97a6c.
Apparently our actual VMs for 10.13 don't get this right, although the
ones used in testing did (prompting the fix this reverts).  We
probably have mis-configured VMs, but this is the quick-fix to get
development moving again.

Task-number: QTBUG-70149
Change-Id: Ib96755d8e21d9b226e22fc985f13f34fa04117b1
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
bb10
Edward Welbourne 2018-08-24 11:46:20 +02:00 committed by Liang Qi
parent ed557c0378
commit 8a270dee2b
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
View File

@ -2726,15 +2726,15 @@ void tst_QDateTime::timeZoneAbbreviation()
qDebug("(Skipped some CET-only tests)");
}
QString cet(QStringLiteral("CET")), cest(QStringLiteral("CEST"));
#ifdef Q_OS_ANDROID // Only reports (general) zones as offsets (QTBUG-68837)
cet = QStringLiteral("GMT+01:00");
cest = QStringLiteral("GMT+02:00");
#elif defined Q_OS_DARWIN // Lacked real names until 10.13, High Sierra
if (QOperatingSystemVersion::current() < QOperatingSystemVersion::MacOSHighSierra) {
cet = QStringLiteral("GMT+1");
cest = QStringLiteral("GMT+2");
}
const QString cet(QStringLiteral("GMT+01:00"));
const QString cest(QStringLiteral("GMT+02:00"));
#elif defined Q_OS_DARWIN
const QString cet(QStringLiteral("GMT+1"));
const QString cest(QStringLiteral("GMT+2"));
#else
const QString cet(QStringLiteral("CET"));
const QString cest(QStringLiteral("CEST"));
#endif
QDateTime dt5(QDate(2013, 1, 1), QTime(0, 0, 0), QTimeZone("Europe/Berlin"));

16
tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
View File

@ -1623,15 +1623,15 @@ void tst_QLocale::formatTimeZone()
qDebug("(Skipped some CET-only tests)");
}
QString cet(QStringLiteral("CET")), cest(QStringLiteral("CEST"));
#ifdef Q_OS_ANDROID // Only reports (general) zones as offsets (QTBUG-68837)
cet = QStringLiteral("GMT+01:00");
cest = QStringLiteral("GMT+02:00");
#elif defined Q_OS_DARWIN // Lacked real names until 10.13, High Sierra
if (QOperatingSystemVersion::current() < QOperatingSystemVersion::MacOSHighSierra) {
cet = QStringLiteral("GMT+1");
cest = QStringLiteral("GMT+2");
}
const QString cet(QStringLiteral("GMT+01:00"));
const QString cest(QStringLiteral("GMT+02:00"));
#elif defined Q_OS_DARWIN
const QString cet(QStringLiteral("GMT+1"));
const QString cest(QStringLiteral("GMT+2"));
#else
const QString cet(QStringLiteral("CET"));
const QString cest(QStringLiteral("CEST"));
#endif
QDateTime dt6(QDate(2013, 1, 1), QTime(0, 0, 0), QTimeZone("Europe/Berlin"));