diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-04 18:58:27 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-04 18:58:27 (GMT) |
| commit | d499f265aa42231fd08df18213083aebe0db59ec (patch) | |
| tree | 272eac57285ae391a4538543c2d68b7ab7a245d6 /tests | |
| parent | 8e98033a67263f6a2d9155f228dc28e2faee4f5e (diff) | |
| parent | 96a169ac3f235433906d58ac0e4c613f51c21bf3 (diff) | |
| download | Qt-d499f265aa42231fd08df18213083aebe0db59ec.zip Qt-d499f265aa42231fd08df18213083aebe0db59ec.tar.gz Qt-d499f265aa42231fd08df18213083aebe0db59ec.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:
My changes for 4.6.2
Fixed the location where bootstrap.sis is looked for.
Added support for smart installer package generation in Symbian
Flush the WSERV command buffer after deleting a surface.
Fix crash when multiple screens are reported from HAL.
Initial support for S60 softkey icons.
Revert "Daylight savings time for Symbian take 2"
Further bug fixes for enable/disables DEF files mechanism on Symbian
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qdatetime/tst_qdatetime.cpp | 7 |
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() |