diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-22 13:32:36 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-22 13:32:36 (GMT) |
| commit | bda9a9163b9ce513cff5fa370882daa76a3fb56a (patch) | |
| tree | 7d0bea9b4803c428ed93f766c9438b3676687602 /tests/auto | |
| parent | 36ad4d194ce0b989d546c0a2f33ac29cd1342cf3 (diff) | |
| parent | c24da6375547e0648beaf0b6d2fb91ff312aacdd (diff) | |
| download | Qt-bda9a9163b9ce513cff5fa370882daa76a3fb56a.zip Qt-bda9a9163b9ce513cff5fa370882daa76a3fb56a.tar.gz Qt-bda9a9163b9ce513cff5fa370882daa76a3fb56a.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:
Added more specific clean targets for Symbian builds
Fixed incorrect headers.
Daylight savings time for Symbian.
Tool for launching symbian apps on the phone from windows command line
Fixes to winscw def files
Fixing compile error on armcc
Diffstat (limited to 'tests/auto')
| -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 1140402..32fa398 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() |