1 files changed, 24 insertions, 42 deletions

diff --git a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
index b128ccebc5..ce7cacf966 100644
--- a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
+++ b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
@@ -37,9 +37,6 @@
 
 #ifdef Q_OS_WIN
 #   include <qt_windows.h>
-#  if defined(Q_OS_WINRT)
-#    define tzset()
-#  endif
 #endif
 
 class tst_QDateTime : public QObject
@@ -81,9 +78,11 @@ private slots:
     void toString_isoDate_data();
     void toString_isoDate();
     void toString_isoDate_extra();
+#if QT_CONFIG(datestring)
     void toString_textDate_data();
     void toString_textDate();
     void toString_textDate_extra();
+#endif
     void toString_rfcDate_data();
     void toString_rfcDate();
     void toString_enumformat();
@@ -145,9 +144,7 @@ private slots:
     void isDaylightTime() const;
     void daylightTransitions() const;
     void timeZones() const;
-#if defined(Q_OS_UNIX)
     void systemTimeZoneChange() const;
-#endif
 
     void invalid() const;
 
@@ -174,7 +171,7 @@ private:
         void reset(const QByteArray &zone)
         {
             qputenv("TZ", zone.constData());
-            tzset();
+            qTzSet();
         }
         ~TimeZoneRollback()
         {
@@ -182,7 +179,7 @@ private:
                 qunsetenv("TZ");
             else
                 qputenv("TZ", prior.constData());
-            tzset();
+            qTzSet();
         }
     };
 };
@@ -805,11 +802,11 @@ void tst_QDateTime::toString_isoDate_data()
     QTest::newRow("positive OffsetFromUTC")
             << dt << Qt::ISODate
             << QString("1978-11-09T13:28:34+05:30");
-    dt.setUtcOffset(-7200);
+    dt.setOffsetFromUtc(-7200);
     QTest::newRow("negative OffsetFromUTC")
             << dt << Qt::ISODate
             << QString("1978-11-09T13:28:34-02:00");
-    dt.setUtcOffset(-900);
+    dt.setOffsetFromUtc(-900);
     QTest::newRow("negative non-integral OffsetFromUTC")
             << dt << Qt::ISODate
             << QString("1978-11-09T13:28:34-00:15");
@@ -845,7 +842,7 @@ void tst_QDateTime::toString_isoDate()
         QCOMPARE(resultDatetime.date(), datetime.date());
         QCOMPARE(resultDatetime.time(), datetime.time());
         QCOMPARE(resultDatetime.timeSpec(), datetime.timeSpec());
-        QCOMPARE(resultDatetime.utcOffset(), datetime.utcOffset());
+        QCOMPARE(resultDatetime.offsetFromUtc(), datetime.offsetFromUtc());
     } else {
         QCOMPARE(resultDatetime, QDateTime());
     }
@@ -875,12 +872,14 @@ void tst_QDateTime::toString_isoDate_extra()
 #endif // timezone
 }
 
+#if QT_CONFIG(datestring)
 void tst_QDateTime::toString_textDate_data()
 {
     QTest::addColumn<QDateTime>("datetime");
     QTest::addColumn<QString>("expected");
 
-    QString wednesdayJanuary = QDate::shortDayName(3) + ' ' + QDate::shortMonthName(1);
+    QString wednesdayJanuary = QLocale::system().dayName(3, QLocale::ShortFormat)
+        + ' ' + QLocale::system().monthName(1, QLocale::ShortFormat);
 
     QTest::newRow("localtime")  << QDateTime(QDate(2013, 1, 2), QTime(1, 2, 3), Qt::LocalTime)
                                 << wednesdayJanuary + QString(" 2 01:02:03 2013");
@@ -909,7 +908,7 @@ void tst_QDateTime::toString_textDate()
     QCOMPARE(resultDatetime.date(), datetime.date());
     QCOMPARE(resultDatetime.time(), datetime.time());
     QCOMPARE(resultDatetime.timeSpec(), datetime.timeSpec());
-    QCOMPARE(resultDatetime.utcOffset(), datetime.utcOffset());
+    QCOMPARE(resultDatetime.offsetFromUtc(), datetime.offsetFromUtc());
 }
 
 void tst_QDateTime::toString_textDate_extra()
@@ -958,6 +957,7 @@ void tst_QDateTime::toString_textDate_extra()
     dt = QDateTime::fromMSecsSinceEpoch(0, Qt::UTC);
     QVERIFY(dt.toString().endsWith(GMT));
 }
+#endif // datestring
 
 void tst_QDateTime::toString_rfcDate_data()
 {
@@ -973,11 +973,11 @@ void tst_QDateTime::toString_rfcDate_data()
             << QDateTime(QDate(1978, 11, 9), QTime(13, 28, 34), Qt::UTC)
             << QString("09 Nov 1978 13:28:34 +0000");
     QDateTime dt(QDate(1978, 11, 9), QTime(13, 28, 34));
-    dt.setUtcOffset(19800);
+    dt.setOffsetFromUtc(19800);
     QTest::newRow("positive OffsetFromUTC")
             << dt
             << QString("09 Nov 1978 13:28:34 +0530");
-    dt.setUtcOffset(-7200);
+    dt.setOffsetFromUtc(-7200);
     QTest::newRow("negative OffsetFromUTC")
             << dt
             << QString("09 Nov 1978 13:28:34 -0200");
@@ -2490,17 +2490,20 @@ void tst_QDateTime::fromString_LOCALE_ILDATE()
 
 void tst_QDateTime::fromStringToStringLocale_data()
 {
+    QTest::addColumn<QLocale>("locale");
     QTest::addColumn<QDateTime>("dateTime");
 
-    QTest::newRow("data0") << QDateTime(QDate(1999, 1, 18), QTime(11, 49, 00));
+    QTest::newRow("frFR") << QLocale(QLocale::French, QLocale::France) << QDateTime(QDate(1999, 1, 18), QTime(11, 49, 00));
+    QTest::newRow("spCO") << QLocale(QLocale::Spanish, QLocale::Colombia) << QDateTime(QDate(1999, 1, 18), QTime(11, 49, 00));
 }
 
 void tst_QDateTime::fromStringToStringLocale()
 {
+    QFETCH(QLocale, locale);
     QFETCH(QDateTime, dateTime);
 
     QLocale def;
-    QLocale::setDefault(QLocale(QLocale::French, QLocale::France));
+    QLocale::setDefault(locale);
 #define ROUNDTRIP(format) \
     QCOMPARE(QDateTime::fromString(dateTime.toString(format), format), dateTime)
 
@@ -3425,33 +3428,10 @@ void tst_QDateTime::timeZones() const
     QCOMPARE(future.offsetFromUtc(), 28800);
 }
 
-#if defined(Q_OS_UNIX)
-// Currently disabled on Windows as adjusting the timezone
-// requires additional privileges that aren't normally
-// enabled for a process. This can be achieved by calling
-// AdjustTokenPrivileges() and then SetTimeZoneInformation(),
-// which will require linking to a different library to access that API.
-static void setTimeZone(const QByteArray &tz)
-{
-    qputenv("TZ", tz);
-    ::tzset();
-
-// following left for future reference, see comment above
-// #if defined(Q_OS_WIN32)
-//     ::_tzset();
-// #endif
-}
-
 void tst_QDateTime::systemTimeZoneChange() const
 {
-    struct ResetTZ {
-        QByteArray original;
-        ResetTZ() : original(qgetenv("TZ")) {}
-        ~ResetTZ() { setTimeZone(original); }
-    } scopedReset;
-
     // Set the timezone to Brisbane time
-    setTimeZone(QByteArray("AEST-10:00"));
+    TimeZoneRollback useZone(QByteArray("AEST-10:00"));
 
     QDateTime localDate = QDateTime(QDate(2012, 6, 1), QTime(2, 15, 30), Qt::LocalTime);
     QDateTime utcDate = QDateTime(QDate(2012, 6, 1), QTime(2, 15, 30), Qt::UTC);
@@ -3464,16 +3444,18 @@ void tst_QDateTime::systemTimeZoneChange() const
     QVERIFY(tzDate.timeZone().isValid());
 
     // Change to Indian time
-    setTimeZone(QByteArray("IST-05:30"));
+    useZone.reset(QByteArray("IST-05:30"));
 
     QCOMPARE(localDate, QDateTime(QDate(2012, 6, 1), QTime(2, 15, 30), Qt::LocalTime));
+#ifdef Q_OS_WINRT
+    QEXPECT_FAIL("", "WinRT gets this wrong, QTBUG-71185", Continue);
+#endif
     QVERIFY(localMsecs != localDate.toMSecsSinceEpoch());
     QCOMPARE(utcDate, QDateTime(QDate(2012, 6, 1), QTime(2, 15, 30), Qt::UTC));
     QCOMPARE(utcDate.toMSecsSinceEpoch(), utcMsecs);
     QCOMPARE(tzDate, QDateTime(QDate(2012, 6, 1), QTime(2, 15, 30), QTimeZone("Australia/Brisbane")));
     QCOMPARE(tzDate.toMSecsSinceEpoch(), tzMsecs);
 }
-#endif
 
 void tst_QDateTime::invalid() const
 {