Merge remote-tracking branch 'origin/dev' into wip/cmake

 Conflicts:
        dependencies.yaml

Change-Id: Ie3e9dc62031a85e5e81cbdf04694b95159d49fca

2 files changed, 42 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmlengine/data/uiLanguage.qml b/tests/auto/qml/qqmlengine/data/uiLanguage.qml
new file mode 100644
index 0000000000..bc20351245
--- /dev/null
+++ b/tests/auto/qml/qqmlengine/data/uiLanguage.qml
@@ -0,0 +1,9 @@
+import QtQml 2.15
+QtObject {
+    property string chosenLanguage: Qt.uiLanguage
+    property string textToTranslate: {
+        numberOfTranslationBindingEvaluations++;
+        return qsTr("Translate me maybe");
+    }
+    property int numberOfTranslationBindingEvaluations: 0
+}
diff --git a/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp b/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp
index d782df3e7f..ab4c083b65 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 ()
@@ -1175,6 +1176,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"