summaryrefslogtreecommitdiffstats
path: root/tests/auto/qdatetime/tst_qdatetime.cpp
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2010-02-10 15:51:48 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2010-02-10 15:51:48 (GMT)
commitc072fa8fdd0cebcaff9062e07d4623bbd7aded3c (patch)
treedb35223ec643fbc5aeadcfab4112e5686ff44b8f /tests/auto/qdatetime/tst_qdatetime.cpp
parentbf54d63fb1b60ad899d0b14889109278bd04fd9d (diff)
parent9a83bf2676dabdf36f9ca491b480b50d8e7ed93d (diff)
downloadQt-c072fa8fdd0cebcaff9062e07d4623bbd7aded3c.zip
Qt-c072fa8fdd0cebcaff9062e07d4623bbd7aded3c.tar.gz
Qt-c072fa8fdd0cebcaff9062e07d4623bbd7aded3c.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1
Diffstat (limited to 'tests/auto/qdatetime/tst_qdatetime.cpp')
-rw-r--r--tests/auto/qdatetime/tst_qdatetime.cpp7
1 files changed, 0 insertions, 7 deletions
diff --git a/tests/auto/qdatetime/tst_qdatetime.cpp b/tests/auto/qdatetime/tst_qdatetime.cpp
index b9d1d7c..86a4c80 100644
--- a/tests/auto/qdatetime/tst_qdatetime.cpp
+++ b/tests/auto/qdatetime/tst_qdatetime.cpp
@@ -147,16 +147,9 @@ Q_DECLARE_METATYPE(QTime)
tst_QDateTime::tst_QDateTime()
{
-#ifdef Q_OS_SYMBIAN
- // Symbian's timezone server cannot handle DST correctly for dates before year 1997
- uint x1 = QDateTime(QDate(2000, 1, 1), QTime()).toTime_t();
- uint x2 = QDateTime(QDate(2000, 6, 1), QTime()).toTime_t();
- europeanTimeZone = (x1 == 946681200 && x2 == 959810400);
-#else
uint x1 = QDateTime(QDate(1990, 1, 1), QTime()).toTime_t();
uint x2 = QDateTime(QDate(1990, 6, 1), QTime()).toTime_t();
europeanTimeZone = (x1 == 631148400 && x2 == 644191200);
-#endif
}
tst_QDateTime::~tst_QDateTime()