1 files changed, 13 insertions, 13 deletions

diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
index dbb758ae42..75fa2216f7 100644
--- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp
+++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
@@ -505,7 +505,7 @@ void tst_QJSEngine::newVariant_valueOfToString()
         QJSValue value = object.property("valueOf").callWithInstance(object);
         QVERIFY(value.isObject());
         QVERIFY(value.strictlyEquals(object));
-        QCOMPARE(object.toString(), QString::fromLatin1("QVariant(QPoint)"));
+        QCOMPARE(object.toString(), QString::fromLatin1("QVariant(QPoint, QPoint(10,20))"));
     }
 }
 
@@ -3157,7 +3157,7 @@ void tst_QJSEngine::dateRoundtripJSQtJS()
 #ifdef Q_OS_WIN
     QSKIP("This test fails on Windows due to a bug in QDateTime.");
 #endif
-    uint secs = QDateTime(QDate(2009, 1, 1)).toUTC().toTime_t();
+    qint64 secs = QDateTime(QDate(2009, 1, 1)).toUTC().toSecsSinceEpoch();
     QJSEngine eng;
     for (int i = 0; i < 8000; ++i) {
         QJSValue jsDate = eng.evaluate(QString::fromLatin1("new Date(%0)").arg(secs * 1000.0));
@@ -3190,7 +3190,7 @@ void tst_QJSEngine::dateConversionJSQt()
 #ifdef Q_OS_WIN
     QSKIP("This test fails on Windows due to a bug in QDateTime.");
 #endif
-    uint secs = QDateTime(QDate(2009, 1, 1)).toUTC().toTime_t();
+    qint64 secs = QDateTime(QDate(2009, 1, 1)).toUTC().toSecsSinceEpoch();
     QJSEngine eng;
     for (int i = 0; i < 8000; ++i) {
         QJSValue jsDate = eng.evaluate(QString::fromLatin1("new Date(%0)").arg(secs * 1000.0));
@@ -3681,7 +3681,7 @@ void tst_QJSEngine::translateScript()
     QJSEngine engine;
 
     TranslationScope tranScope(":/translations/translatable_la");
-    engine.installTranslatorFunctions();
+    engine.installExtensions(QJSEngine::TranslationExtension);
 
     QCOMPARE(engine.evaluate(expression, fileName).toString(), expectedTranslation);
 }
@@ -3690,7 +3690,7 @@ void tst_QJSEngine::translateScript_crossScript()
 {
     QJSEngine engine;
     TranslationScope tranScope(":/translations/translatable_la");
-    engine.installTranslatorFunctions();
+    engine.installExtensions(QJSEngine::TranslationExtension);
 
     QString fileName = QString::fromLatin1("translatable.js");
     QString fileName2 = QString::fromLatin1("translatable2.js");
@@ -3712,7 +3712,7 @@ void tst_QJSEngine::translateScript_trNoOp()
 {
     QJSEngine engine;
     TranslationScope tranScope(":/translations/translatable_la");
-    engine.installTranslatorFunctions();
+    engine.installExtensions(QJSEngine::TranslationExtension);
 
     QVERIFY(engine.evaluate("QT_TR_NOOP()").isUndefined());
     QCOMPARE(engine.evaluate("QT_TR_NOOP('One')").toString(), QString::fromLatin1("One"));
@@ -3726,7 +3726,7 @@ void tst_QJSEngine::translateScript_callQsTrFromCpp()
 {
     QJSEngine engine;
     TranslationScope tranScope(":/translations/translatable_la");
-    engine.installTranslatorFunctions();
+    engine.installExtensions(QJSEngine::TranslationExtension);
 
     // There is no context, but it shouldn't crash
     QCOMPARE(engine.globalObject().property("qsTr").call(QJSValueList() << "One").toString(), QString::fromLatin1("One"));
@@ -3759,7 +3759,7 @@ void tst_QJSEngine::translateWithInvalidArgs()
     QFETCH(QString, expression);
     QFETCH(QString, expectedError);
     QJSEngine engine;
-    engine.installTranslatorFunctions();
+    engine.installExtensions(QJSEngine::TranslationExtension);
     QJSValue result = engine.evaluate(expression);
     QVERIFY(result.isError());
     QCOMPARE(result.toString(), expectedError);
@@ -3795,7 +3795,7 @@ void tst_QJSEngine::translationContext()
     TranslationScope tranScope(":/translations/translatable_la");
 
     QJSEngine engine;
-    engine.installTranslatorFunctions();
+    engine.installExtensions(QJSEngine::TranslationExtension);
 
     QFETCH(QString, path);
     QFETCH(QString, text);
@@ -3810,7 +3810,7 @@ void tst_QJSEngine::translateScriptIdBased()
     QJSEngine engine;
 
     TranslationScope tranScope(":/translations/idtranslatable_la");
-    engine.installTranslatorFunctions();
+    engine.installExtensions(QJSEngine::TranslationExtension);
 
     QString fileName = QString::fromLatin1("idtranslatable.js");
 
@@ -3892,7 +3892,7 @@ void tst_QJSEngine::translateScriptUnicode()
     QJSEngine engine;
 
     TranslationScope tranScope(":/translations/translatable-unicode");
-    engine.installTranslatorFunctions();
+    engine.installExtensions(QJSEngine::TranslationExtension);
 
     QCOMPARE(engine.evaluate(expression, fileName).toString(), expectedTranslation);
 }
@@ -3922,7 +3922,7 @@ void tst_QJSEngine::translateScriptUnicodeIdBased()
     QJSEngine engine;
 
     TranslationScope tranScope(":/translations/idtranslatable-unicode");
-    engine.installTranslatorFunctions();
+    engine.installExtensions(QJSEngine::TranslationExtension);
 
     QCOMPARE(engine.evaluate(expression).toString(), expectedTranslation);
 }
@@ -3930,7 +3930,7 @@ void tst_QJSEngine::translateScriptUnicodeIdBased()
 void tst_QJSEngine::translateFromBuiltinCallback()
 {
     QJSEngine eng;
-    eng.installTranslatorFunctions();
+    eng.installExtensions(QJSEngine::TranslationExtension);
 
     // Callback has no translation context.
     eng.evaluate("function foo() { qsTr('foo'); }");