diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2015-01-21 11:14:34 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-01-21 11:14:34 +0100 |
| commit | 112342b32650f56e289c7dcd181d5897b0b77a78 (patch) | |
| tree | 76e9a37bcaa70097d009628bb2b116ea782c72cb /tests/auto/testlib/selftests/expected_datetime.txt | |
| parent | 3bbc1bf53bac7648637d92abecadc568acfffb2d (diff) | |
| parent | b6191b16d41459ed73cea738dfaf8e25e81ae22b (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/testlib/selftests/expected_datetime.txt')
| -rw-r--r-- | tests/auto/testlib/selftests/expected_datetime.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/testlib/selftests/expected_datetime.txt b/tests/auto/testlib/selftests/expected_datetime.txt index 1139c70ab8..c29fa050a1 100644 --- a/tests/auto/testlib/selftests/expected_datetime.txt +++ b/tests/auto/testlib/selftests/expected_datetime.txt @@ -2,7 +2,7 @@ Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@ PASS : tst_DateTime::initTestCase() FAIL! : tst_DateTime::dateTime() Compared values are not the same - Actual (local): 2000/05/03 04:03:04.000[local time] + Actual (local): 2000/05/03 04:03:04.000[UTC+00:02] Expected (utc) : 2000/05/03 04:03:04.000[UTC] Loc: [tst_datetime.cpp(65)] PASS : tst_DateTime::qurl(empty urls) |