diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-05 15:50:31 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-05 15:50:31 (GMT) |
| commit | 2d298f468fa80003386aeb7304274659153923a3 (patch) | |
| tree | c002f908f2a2ac66d20d3f45aba7d5605d656ea6 /tests | |
| parent | 58217cab1668aeafbc95934f878c834cb515a8ef (diff) | |
| parent | 8ef60f0791c1fb7fa649214238db6db3e2d975c6 (diff) | |
| download | Qt-2d298f468fa80003386aeb7304274659153923a3.zip Qt-2d298f468fa80003386aeb7304274659153923a3.tar.gz Qt-2d298f468fa80003386aeb7304274659153923a3.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:
Revert "Support time zone designator in QDateTime::fromString() based on ISO 8601-2004 standard."
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qdatetime/tst_qdatetime.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/auto/qdatetime/tst_qdatetime.cpp b/tests/auto/qdatetime/tst_qdatetime.cpp index d23133d..86a4c80 100644 --- a/tests/auto/qdatetime/tst_qdatetime.cpp +++ b/tests/auto/qdatetime/tst_qdatetime.cpp @@ -1286,12 +1286,6 @@ void tst_QDateTime::fromString() dt = QDateTime::fromString("2002-10-01", Qt::ISODate); QCOMPARE(dt, QDateTime(QDate(2002, 10, 1), QTime(0, 0, 0, 0))); - dt = QDateTime::fromString("1987-02-13T13:24:51+01:00", Qt::ISODate); - QCOMPARE(dt, QDateTime(QDate(1987, 2, 13), QTime(12, 24, 51), Qt::UTC)); - - dt = QDateTime::fromString("1987-02-13T13:24:51-01:00", Qt::ISODate); - QCOMPARE(dt, QDateTime(QDate(1987, 2, 13), QTime(14, 24, 51), Qt::UTC)); - dt = QDateTime::fromString("Thu Jan 1 00:12:34 1970 GMT"); QCOMPARE(dt.toUTC(), QDateTime(QDate(1970, 1, 1), QTime(0, 12, 34), Qt::UTC)); |