summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZeno Albisser <zeno.albisser@nokia.com>2011-04-28 10:50:47 (GMT)
committerQt Commercial Integration <QtCommercial@digia.com>2012-01-31 10:25:12 (GMT)
commite69d789858db4c8f15543dbf2795fc996139c146 (patch)
treea70beaa6fd90c618892a0ad2bc5e16a91b90d632
parent0898c75343e9bd079da5a8253a82d68b45445713 (diff)
downloadQt-e69d789858db4c8f15543dbf2795fc996139c146.zip
Qt-e69d789858db4c8f15543dbf2795fc996139c146.tar.gz
Qt-e69d789858db4c8f15543dbf2795fc996139c146.tar.bz2
fix tst_qscriptengine after merging MR-1149
Reviewed-by: Olivier Goffart
-rw-r--r--tests/auto/qscriptengine/tst_qscriptengine.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp
index 0537697..344407a 100644
--- a/tests/auto/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp
@@ -5202,6 +5202,7 @@ void tst_QScriptEngine::dateConversionJSQt()
QString qtUTCDateStr = qtDate.toUTC().toString(Qt::ISODate);
QString jsUTCDateStr = jsDate.property("toISOString").call(jsDate).toString();
jsUTCDateStr.chop(5); // get rid of milliseconds (".000Z")
+ jsUTCDateStr.append("Z"); // append the timezone specifier again
if (qtUTCDateStr != jsUTCDateStr)
QFAIL(qPrintable(jsDate.toString()));
secs += 2*60*60;
@@ -5216,6 +5217,7 @@ void tst_QScriptEngine::dateConversionQtJS()
QScriptValue jsDate = eng.newDate(qtDate);
QString jsUTCDateStr = jsDate.property("toISOString").call(jsDate).toString();
jsUTCDateStr.chop(5); // get rid of milliseconds (".000Z")
+ jsUTCDateStr.append("Z"); // append the timezone specifier again
QString qtUTCDateStr = qtDate.toUTC().toString(Qt::ISODate);
if (jsUTCDateStr != qtUTCDateStr)
QFAIL(qPrintable(qtDate.toString()));