diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-04 02:39:52 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-04 02:39:52 (GMT) |
| commit | bd202b822401989aa1abe3e2ad24344d71d6dfb3 (patch) | |
| tree | 07d04f48cf13c6f1f6b252642e2d71f57f3813d9 /tests | |
| parent | 6f2d27fd686f5cef0dc52f220ffeeded529d2793 (diff) | |
| parent | deeb384ab6eec1a7db86c0eefafd19df6f7536a1 (diff) | |
| download | Qt-bd202b822401989aa1abe3e2ad24344d71d6dfb3.zip Qt-bd202b822401989aa1abe3e2ad24344d71d6dfb3.tar.gz Qt-bd202b822401989aa1abe3e2ad24344d71d6dfb3.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Adjust rw base address for gui built with GCCE for Symbian OS
Added descriptions of translatable strings for Phonon MMF reverb effect
Corrected namespace for Phonon::MMF translatable error strings
Compile fix for non-Symbian compilers
S60 softkey refactoring (support for merging, priorities and menus)
Daylight savings time for Symbian take 2
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qdatetime/tst_qdatetime.cpp | 7 |
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() |