Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: I59cb196ab17ed8504b33db01d827052eb6891efa

1 files changed, 27 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp b/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp
index ce654dc45e..a9c28a0911 100644
--- a/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp
+++ b/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp
@@ -50,6 +50,9 @@ private slots:
     void application();
     void applicationProperties();
     void removeObjectsWhenDestroyed();
+    void loadTranslation_data();
+    void loadTranslation();
+
 private:
     QString buildDir;
     QString srcDir;
@@ -241,6 +244,30 @@ void tst_qqmlapplicationengine::removeObjectsWhenDestroyed()
     QCOMPARE(test->rootObjects().size(), 0);
 }
 
+void tst_qqmlapplicationengine::loadTranslation_data()
+{
+    QTest::addColumn<QUrl>("qmlUrl");
+    QTest::addColumn<QString>("translation");
+
+    QTest::newRow("local file") << testFileUrl("loadTranslation.qml")
+                                  << QStringLiteral("translated");
+    QTest::newRow("qrc") << QUrl(QLatin1String("qrc:///data/loadTranslation.qml"))
+                                  << QStringLiteral("translated");
+}
+
+void tst_qqmlapplicationengine::loadTranslation()
+{
+    QFETCH(QUrl, qmlUrl);
+    QFETCH(QString, translation);
+
+    QQmlApplicationEngine test(qmlUrl);
+    QVERIFY(!test.rootObjects().isEmpty());
+
+    QObject *rootObject = test.rootObjects().first();
+    QVERIFY(rootObject);
+
+    QCOMPARE(rootObject->property("translation").toString(), translation);
+}
 
 QTEST_MAIN(tst_qqmlapplicationengine)