diff options
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp | 16 | ||||
| -rw-r--r-- | tests/auto/corelib/tools/qlocale/tst_qlocale.cpp | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp index d460beafde..c0b7674f22 100644 --- a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp +++ b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp @@ -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) - 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")); + 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"); + } #endif QDateTime dt5(QDate(2013, 1, 1), QTime(0, 0, 0), QTimeZone("Europe/Berlin")); diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp index b76851a0ec..d649e66158 100644 --- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp +++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp @@ -1585,15 +1585,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) - 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")); + 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"); + } #endif QDateTime dt6(QDate(2013, 1, 1), QTime(0, 0, 0), QTimeZone("Europe/Berlin")); |