1 files changed, 53 insertions, 12 deletions

diff --git a/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp b/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp
index 613616ab71..cfbbd2a94c 100644
--- a/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp
+++ b/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp
@@ -84,6 +84,7 @@ private slots:
     void aggressiveGc();
     void cachedGetterLookup_qtbug_75335();
     void createComponentOnSingletonDestruction();
+    void uiLanguage();
 
 public slots:
     QObject *createAQObjectForOwnershipTest ()
@@ -425,12 +426,13 @@ void tst_qqmlengine::trimComponentCache()
 
     QQmlEngine engine;
     ComponentCacheFunctions componentCache(engine);
-    engine.rootContext()->setContextProperty("componentCache", &componentCache);
     engine.setIncubationController(&componentCache);
 
     QQmlComponent component(&engine, testFileUrl(file));
     QVERIFY2(component.isReady(), qPrintable(component.errorString()));
-    QScopedPointer<QObject> object(component.create());
+    QScopedPointer<QObject> object(component.createWithInitialProperties({
+            {"componentCache", QVariant::fromValue(&componentCache)}
+    }));
     QVERIFY(object != nullptr);
     QCOMPARE(object->property("success").toBool(), true);
 }
@@ -512,6 +514,7 @@ void tst_qqmlengine::failedCompilation()
     QQmlEngine engine;
 
     QQmlComponent component(&engine, testFileUrl(file));
+    QTest::ignoreMessage(QtMsgType::QtWarningMsg, "QQmlComponent: Component is not ready");
     QVERIFY(!component.isReady());
     QScopedPointer<QObject> object(component.create());
     QVERIFY(object.isNull());
@@ -602,11 +605,10 @@ void tst_qqmlengine::objectOwnership()
         {
             QQmlEngine engine;
             QQmlComponent c(&engine);
-            engine.rootContext()->setContextProperty("test", this);
             QQmlEngine::setObjectOwnership(ptr, QQmlEngine::JavaScriptOwnership);
-            c.setData("import QtQuick 2.0; Item { property int data: test.createAQObjectForOwnershipTest() ? 0 : 1 }", QUrl());
+            c.setData("import QtQuick 2.0; Item { required property QtObject test; property int data: test.createAQObjectForOwnershipTest() ? 0 : 1 }", QUrl());
             QVERIFY(c.isReady());
-            QObject *o = c.create();
+            QObject *o = c.createWithInitialProperties( {{"test", QVariant::fromValue(this)}} );
             QVERIFY(o != nullptr);
         }
         QTRY_VERIFY(spy.count());
@@ -617,13 +619,13 @@ void tst_qqmlengine::objectOwnership()
         {
             QQmlEngine engine;
             QQmlComponent c(&engine);
-            engine.rootContext()->setContextProperty("test", ptr);
             QQmlEngine::setObjectOwnership(ptr, QQmlEngine::JavaScriptOwnership);
-            c.setData("import QtQuick 2.0; QtObject { property var object: { var i = test; test ? 0 : 1 }  }", QUrl());
+            c.setData("import QtQuick 2.0; QtObject { required property QtObject test; property var object: { var i = test; test ? 0 : 1 }  }", QUrl());
             QVERIFY(c.isReady());
-            QObject *o = c.create();
+            QObject *o = c.createWithInitialProperties({{"test", QVariant::fromValue(ptr)}});
             QVERIFY(o != nullptr);
-            engine.rootContext()->setContextProperty("test", nullptr);
+            QQmlProperty testProp(o, "test");
+            testProp.write(QVariant::fromValue<QObject*>(nullptr));
         }
         QTRY_VERIFY(spy.count());
     }
@@ -773,6 +775,7 @@ public:
 };
 
 Q_DECLARE_METATYPE(QList<QQmlAbstractUrlInterceptor::DataType>);
+
 void tst_qqmlengine::urlInterceptor_data()
 {
     QTest::addColumn<QUrl>("testFile");
@@ -941,14 +944,15 @@ void tst_qqmlengine::cppSignalAndEval()
 {
     ObjectCaller objectCaller;
     QQmlEngine engine;
-    engine.rootContext()->setContextProperty(QLatin1String("CallerCpp"), &objectCaller);
+    qmlRegisterSingletonInstance("Test", 1, 0, "CallerCpp", &objectCaller);
     QQmlComponent c(&engine);
     c.setData("import QtQuick 2.9\n"
+              "import Test 1.0\n"
               "Item {\n"
               "    property var r: 0\n"
               "    Connections {\n"
               "        target: CallerCpp;\n"
-              "        onDoubleReply: {\n"
+              "        function onDoubleReply() {\n"
               "            eval('var z = 1');\n"
               "            r = a;\n"
               "        }\n"
@@ -993,6 +997,11 @@ public:
     SomeQObjectClass() : QObject(nullptr){}
 };
 
+class Dayfly : public QObject
+{
+    Q_OBJECT
+};
+
 void tst_qqmlengine::singletonInstance()
 {
     QQmlEngine engine;
@@ -1111,7 +1120,7 @@ void tst_qqmlengine::singletonInstance()
 
     {
         // deleted object
-        auto dayfly = new QObject{};
+        auto dayfly = new Dayfly{};
         auto id = qmlRegisterSingletonInstance("Vanity", 1, 0, "Dayfly", dayfly);
         delete dayfly;
         QTest::ignoreMessage(QtMsgType::QtWarningMsg, "<Unknown File>: The registered singleton has already been deleted. Ensure that it outlives the engine.");
@@ -1172,6 +1181,38 @@ void tst_qqmlengine::createComponentOnSingletonDestruction()
     QVERIFY(obj);
 }
 
+void tst_qqmlengine::uiLanguage()
+{
+    QQmlEngine engine;
+
+    QObject::connect(&engine, &QJSEngine::uiLanguageChanged, [&engine]() {
+        engine.retranslate();
+    });
+
+    QSignalSpy uiLanguageChangeSpy(&engine, SIGNAL(uiLanguageChanged()));
+
+    QQmlComponent component(&engine, testFileUrl("uiLanguage.qml"));
+
+    QTest::ignoreMessage(QtMsgType::QtWarningMsg, (component.url().toString() + ":2:1: QML QtObject: Binding loop detected for property \"textToTranslate\"").toLatin1());
+    QScopedPointer<QObject> object(component.create());
+    QVERIFY(!object.isNull());
+
+    QVERIFY(engine.uiLanguage().isEmpty());
+    QCOMPARE(object->property("numberOfTranslationBindingEvaluations").toInt(), 1);
+
+    QTest::ignoreMessage(QtMsgType::QtWarningMsg, (component.url().toString() + ":2:1: QML QtObject: Binding loop detected for property \"textToTranslate\"").toLatin1());
+    engine.setUiLanguage("TestLanguage");
+    QCOMPARE(object->property("numberOfTranslationBindingEvaluations").toInt(), 2);
+    QCOMPARE(object->property("chosenLanguage").toString(), "TestLanguage");
+
+
+    QTest::ignoreMessage(QtMsgType::QtWarningMsg, (component.url().toString() + ":2:1: QML QtObject: Binding loop detected for property \"textToTranslate\"").toLatin1());
+    engine.evaluate("Qt.uiLanguage = \"anotherLanguage\"");
+    QCOMPARE(engine.uiLanguage(), QString("anotherLanguage"));
+    QCOMPARE(object->property("numberOfTranslationBindingEvaluations").toInt(), 3);
+    QCOMPARE(object->property("chosenLanguage").toString(), "anotherLanguage");
+}
+
 QTEST_MAIN(tst_qqmlengine)
 
 #include "tst_qqmlengine.moc"