1 files changed, 7 insertions, 33 deletions
diff --git a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
index b128ccebc5..6ad3357f40 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
@@ -145,9 +142,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 +169,7 @@ private:
         void reset(const QByteArray &zone)
         {
             qputenv("TZ", zone.constData());
-            tzset();
+            qTzSet();
         }
         ~TimeZoneRollback()
         {
@@ -182,7 +177,7 @@ private:
                 qunsetenv("TZ");
             else
                 qputenv("TZ", prior.constData());
-            tzset();
+            qTzSet();
         }
     };
 };
@@ -3425,33 +3420,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 +3436,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
 {