diff options
author | Jerome Pasion <jerome.pasion@digia.com> | 2012-11-02 14:59:56 +0100 |
---|---|---|
committer | Jerome Pasion <jerome.pasion@digia.com> | 2012-11-02 15:02:08 +0100 |
commit | 47c45bb1e487b3823281683c1110d9269f144582 (patch) | |
tree | 4c687d46d9aa7d90f064a25e6c7f0241ae28e16d /tests/auto/qml/qqmlecmascript | |
parent | 677be9a27770ff48dd771ec4fc1c66139aac4aa8 (diff) | |
parent | 7d94fa8e074ba816751c60bd0ad3c63b3c0b0a27 (diff) |
Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtdeclarative into newdocs
Change-Id: Icced038fbdb309d8928213d3753a27fe5a6b1137
Diffstat (limited to 'tests/auto/qml/qqmlecmascript')
-rw-r--r-- | tests/auto/qml/qqmlecmascript/data/exportDate.2.qml | 2 | ||||
-rw-r--r-- | tests/auto/qml/qqmlecmascript/data/exportDate.qml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qml/qqmlecmascript/data/exportDate.2.qml b/tests/auto/qml/qqmlecmascript/data/exportDate.2.qml index 8ad75aabb0..4420cf846c 100644 --- a/tests/auto/qml/qqmlecmascript/data/exportDate.2.qml +++ b/tests/auto/qml/qqmlecmascript/data/exportDate.2.qml @@ -12,7 +12,7 @@ MyTypeObject { // The test date is 2009-5-12 23:59:59 (local time) var compare = new Date(2009, 5-1, 12, 23, 59, 59) - var compareOffset = new Date().getTimezoneOffset() + var compareOffset = compare.getTimezoneOffset() // The date is already in local time, so we can use the partial values directly var dtAdjusted = dt diff --git a/tests/auto/qml/qqmlecmascript/data/exportDate.qml b/tests/auto/qml/qqmlecmascript/data/exportDate.qml index 13b35a9cb8..c42b092fc7 100644 --- a/tests/auto/qml/qqmlecmascript/data/exportDate.qml +++ b/tests/auto/qml/qqmlecmascript/data/exportDate.qml @@ -12,7 +12,7 @@ MyTypeObject { // The test date is 2009-5-12 00:00:01 (local time) var compare = new Date(2009, 5-1, 12, 0, 0, 1) - var compareOffset = new Date().getTimezoneOffset() + var compareOffset = compare.getTimezoneOffset() // The date is already in local time, so we can use the partial values directly var dtAdjusted = dt |