diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-02 11:57:48 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-02 11:57:48 +0100 |
| commit | f115ae7001d65477a615bb5f78b08bc0b0004181 (patch) | |
| tree | 83a6fdbee3d8d557584ae708fbdbad4e1c85335b /tests/auto/corelib | |
| parent | 15ae7949661c6d7f401c83af5bdbb63a2ec46a2a (diff) | |
| parent | b44df9937e4b15596b994f8e20822b83ac4bed29 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
Change-Id: Ia28ea4f29d308ba3aa16c2a86ffc57049c6ea590
Diffstat (limited to 'tests/auto/corelib')
| -rw-r--r-- | tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp index 3926a8f719..d2ffe50ce8 100644 --- a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp +++ b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp @@ -2288,6 +2288,7 @@ void tst_QDateTime::fromStringDateFormat_data() QTest::newRow("ISO short") << QString::fromLatin1("2017-07-01T") << Qt::ISODate << invalidDateTime(); QTest::newRow("ISO zoned date") << QString::fromLatin1("2017-07-01Z") << Qt::ISODate << invalidDateTime(); QTest::newRow("ISO zoned empty time") << QString::fromLatin1("2017-07-01TZ") << Qt::ISODate << invalidDateTime(); + QTest::newRow("ISO mis-punctuated") << QString::fromLatin1("2018/01/30 ") << Qt::ISODate << invalidDateTime(); // Test Qt::RFC2822Date format (RFC 2822). QTest::newRow("RFC 2822 +0100") << QString::fromLatin1("13 Feb 1987 13:24:51 +0100") |