summaryrefslogtreecommitdiffstats
path: root/tests/auto/qdatetime
diff options
context:
space:
mode:
authorJustin McPherson <justin.mcpherson@nokia.com>2010-02-05 05:24:23 (GMT)
committerJustin McPherson <justin.mcpherson@nokia.com>2010-02-05 05:24:23 (GMT)
commit9f43d4aafeb16c81bc1a161c99dee2df19772e42 (patch)
tree081f5c2323f6fadf49f2d1fada8a7c0cb4bc953c /tests/auto/qdatetime
parentf14e3b86e6b7b496017ddd462821325bdb40c779 (diff)
parent7474ad656269aec1352d166bb5a4435086d48482 (diff)
downloadQt-9f43d4aafeb16c81bc1a161c99dee2df19772e42.zip
Qt-9f43d4aafeb16c81bc1a161c99dee2df19772e42.tar.gz
Qt-9f43d4aafeb16c81bc1a161c99dee2df19772e42.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'tests/auto/qdatetime')
-rw-r--r--tests/auto/qdatetime/tst_qdatetime.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/auto/qdatetime/tst_qdatetime.cpp b/tests/auto/qdatetime/tst_qdatetime.cpp
index 86a4c80..b9d1d7c 100644
--- a/tests/auto/qdatetime/tst_qdatetime.cpp
+++ b/tests/auto/qdatetime/tst_qdatetime.cpp
@@ -147,9 +147,16 @@ 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()