summaryrefslogtreecommitdiffstats
path: root/tests/auto/qscriptengine
diff options
context:
space:
mode:
authorZeno Albisser <zeno.albisser@nokia.com>2011-04-28 10:50:47 (GMT)
committerZeno Albisser <zeno.albisser@nokia.com>2011-04-28 11:03:05 (GMT)
commit2fe1f118a791383de68d33a76f72d260f8bda2eb (patch)
tree7bdc37f7db37afbd84b1c38fedd58858438a4064 /tests/auto/qscriptengine
parent8d4cd52b6981a4e6deea7fdb77f56e40c4f3e6ba (diff)
downloadQt-2fe1f118a791383de68d33a76f72d260f8bda2eb.zip
Qt-2fe1f118a791383de68d33a76f72d260f8bda2eb.tar.gz
Qt-2fe1f118a791383de68d33a76f72d260f8bda2eb.tar.bz2
fix tst_qscriptengine after merging MR-1149
Reviewed-by: Olivier Goffart
Diffstat (limited to 'tests/auto/qscriptengine')
-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 bc4091d..7ba2be2 100644
--- a/tests/auto/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp
@@ -5815,6 +5815,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;
@@ -5829,6 +5830,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()));